diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-12-18 15:24:30 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-12-18 15:24:30 +0000 |
| commit | 5cfcdaac505e60914ee4398cfe431bd5d21b58ed (patch) | |
| tree | 43c2ce66dda3e291cf2dc1aa688a48b2dc5ef45a /app/assets/javascripts/admin.js | |
| parent | f0bbeb4abf4bf07e5cfb46668f39bbff72ed7210 (diff) | |
| parent | 1d6acb2af8e3f4c4926f47f097466c5e2acdac68 (diff) | |
Merge branch 'admin-public-holiday-interface' into rails-3-develop
Diffstat (limited to 'app/assets/javascripts/admin.js')
| -rw-r--r-- | app/assets/javascripts/admin.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js index 4925a65a4..9402f7f6c 100644 --- a/app/assets/javascripts/admin.js +++ b/app/assets/javascripts/admin.js @@ -3,8 +3,10 @@ //= require jquery.ui.tabs //= require jquery.ui.sortable //= require jquery.ui.effect-highlight -//= require admin/bootstrap-collapse -//= require admin/bootstrap-tab +//= require bootstrap-collapse +//= require bootstrap-tab +//= require bootstrap-dropdown //= require admin/admin //= require admin/category-order +//= require admin/holidays //= require jquery_ujs |