forked from saurabh/orbit4-5
Conflicts: app/controllers/admin/dashboards_controller.rb config/application.rb |
||
|---|---|---|
| .. | ||
| index.html.erb | ||
| menu.html.erb | ||
| page.html.erb | ||
| submenu.html.erb | ||
Conflicts: app/controllers/admin/dashboards_controller.rb config/application.rb |
||
|---|---|---|
| .. | ||
| index.html.erb | ||
| menu.html.erb | ||
| page.html.erb | ||
| submenu.html.erb | ||