diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-01-29 16:10:52 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-01-29 16:10:52 +0000 |
| commit | 184ffeccb7f4579b481db9b7744aa9baed70562f (patch) | |
| tree | 67c023b029a699a1e727ef6becdc0832e82ea1c5 /config/application.rb | |
| parent | e44c8b875fd4ad46b954ef9c31bdb6f0366dcb9e (diff) | |
| parent | 79b2f672aeae394a2c195d89b70bda27bb3201a4 (diff) | |
Merge branch 'feature/batch-requests' into rails-3-develop
Conflicts:
config/general.yml-example
spec/factories.rb
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index cbc7b9413..6b7d1b976 100644 --- a/config/application.rb +++ b/config/application.rb @@ -103,6 +103,9 @@ module Alaveteli 'jquery.fancybox-1.3.4.css', 'jquery.Jcrop.css', 'excanvas.min.js', + 'select-authorities.js', + 'jquery_ujs.js', + 'new-request.js', 'fonts.css', 'print.css', 'admin.css', |