forked from saurabh/orbit4-5
Conflicts: app/controllers/admin/dashboards_controller.rb config/application.rb |
||
|---|---|---|
| .. | ||
| bootstrap | ||
| lib | ||
| plugin | ||
| app.js | ||
| bootstrap.js | ||
| orbit_classic_test.js | ||
Conflicts: app/controllers/admin/dashboards_controller.rb config/application.rb |
||
|---|---|---|
| .. | ||
| bootstrap | ||
| lib | ||
| plugin | ||
| app.js | ||
| bootstrap.js | ||
| orbit_classic_test.js | ||