diff options
author | Louise Crow <louise.crow@gmail.com> | 2014-05-15 16:09:29 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2014-05-15 16:09:29 +0100 |
commit | 26348ce676f7ebbabcc535b2ecf00f99f8fe85c0 (patch) | |
tree | 6034dd656a0f9af152f24d6c491b5e61a7190a7d /app/assets/javascripts/application.js | |
parent | 851ef575cf3c55a3bb194381497b958c2a3ebf1a (diff) | |
parent | b3fa23047bf96bd6a08273c9491ac1ee3b4a3f80 (diff) |
Merge branch 'release/0.18' into wdtk
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 |