forked from saurabh/orbit4-5
Conflicts: app/controllers/admin/dashboards_controller.rb config/application.rb |
||
|---|---|---|
| .. | ||
| _footer.scss | ||
| _header.scss | ||
| _main-menu.scss | ||
| _main-slide.scss | ||
| _style.scss | ||
Conflicts: app/controllers/admin/dashboards_controller.rb config/application.rb |
||
|---|---|---|
| .. | ||
| _footer.scss | ||
| _header.scss | ||
| _main-menu.scss | ||
| _main-slide.scss | ||
| _style.scss | ||