forked from saurabh/orbit4-5
Conflicts: app/controllers/admin/dashboards_controller.rb config/application.rb |
||
|---|---|---|
| .. | ||
| _form.html.erb | ||
| create.js | ||
| destroy.js | ||
| edit.html.erb | ||
| index.html.erb | ||
| new.html.erb | ||
| update.js | ||
Conflicts: app/controllers/admin/dashboards_controller.rb config/application.rb |
||
|---|---|---|
| .. | ||
| _form.html.erb | ||
| create.js | ||
| destroy.js | ||
| edit.html.erb | ||
| index.html.erb | ||
| new.html.erb | ||
| update.js | ||