diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-11-29 15:06:07 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-11-29 15:06:07 +0000 |
| commit | eb1432f9992275df485f8502ad3ab6f7c8d494b7 (patch) | |
| tree | ec20310d47c7f4e4cd136ac1671b32db4a379ea7 /app/assets/javascripts/application.js | |
| parent | 5ddd0620f8023c4bbf7d82e61f841dadd73bb7ba (diff) | |
| parent | 20089cf7b5045d504b7240bc92e2b6068fcc2246 (diff) | |
Merge remote-tracking branch 'origin/merged-rails-3-2-assset-pipeline' into rails-3-develop
Conflicts:
Gemfile.lock
Diffstat (limited to 'app/assets/javascripts/application.js')
| -rw-r--r-- | app/assets/javascripts/application.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 000000000..d8aed6346 --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,6 @@ +// ... +//= require jquery +//= require jquery.ui.datepicker +//= require jquery.cookie +//= require general +//= require ba-throttle-debounce |