forked from saurabh/orbit4-5
Conflicts: app/controllers/admin/dashboards_controller.rb config/application.rb |
||
|---|---|---|
| .. | ||
| _footer.html.erb | ||
| _head.html.erb | ||
| _header.html.erb | ||
| _menu.html.erb | ||
Conflicts: app/controllers/admin/dashboards_controller.rb config/application.rb |
||
|---|---|---|
| .. | ||
| _footer.html.erb | ||
| _head.html.erb | ||
| _header.html.erb | ||
| _menu.html.erb | ||