Merge branch 'dev' into user_dashboard
Conflicts: app/views/layouts/_head_panel.html.erb
Showing
app/assets/images/bg-header.png
0 → 100644
212 字节
app/assets/images/icon-search.png
0 → 100644
422 字节
app/assets/images/images.png
0 → 100644
8.5 KB
app/assets/images/login-logo.png
0 → 100644
1.4 KB
app/assets/stylesheets/style.scss
0 → 100755
此差异已折叠。
1.0 KB
640 字节
747 字节
640 字节
public/apple-touch-icon.png
0 → 100755
640 字节
public/favicon.ico
100644 → 100755
无法预览此类型文件