diff options
author | Louise Crow <louise.crow@gmail.com> | 2014-05-15 17:01:22 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2014-05-15 17:01:22 +0100 |
commit | bb5f95040d377d86629012347343fbf2c7dda016 (patch) | |
tree | be696ec2615b098db34449a982fcb09a68c9c49b /app/assets/javascripts/application.js | |
parent | 6d215fba5cc709c43f12f86da39a643e4be5922b (diff) | |
parent | 21027d0d1197e7ac447296ab68a25159860888b2 (diff) |
Merge remote-tracking branch 'origin/release/0.18'0.18
Diffstat (limited to 'app/assets/javascripts/application.js')
-rw-r--r-- | app/assets/javascripts/application.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d8aed6346..fd49d3b53 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,6 +1,8 @@ // ... //= require jquery +//= require jquery_ujs //= require jquery.ui.datepicker +//= require jquery.ui.position //= require jquery.cookie //= require general //= require ba-throttle-debounce |