diff options
author | jessib <jessib@riseup.net> | 2014-01-27 10:30:11 -0800 |
---|---|---|
committer | jessib <jessib@riseup.net> | 2014-01-27 10:30:11 -0800 |
commit | 7e0573f3347dca6323eae05127849431ecbceb77 (patch) | |
tree | 8a6ff58fdcc93493b5a8f332350b0a9292119906 /core/lib/leap_web_core/ui_dependencies.rb | |
parent | 3bfbf0ad20bb5b8e4689fda287cd47738571d10d (diff) | |
parent | d578c07e196cd9758fbf1752a9bb8477c260bb30 (diff) |
Merge branch 'develop' into feature/messages_api
Conflicts:
users/config/locales/en.yml
Diffstat (limited to 'core/lib/leap_web_core/ui_dependencies.rb')
-rw-r--r-- | core/lib/leap_web_core/ui_dependencies.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/lib/leap_web_core/ui_dependencies.rb b/core/lib/leap_web_core/ui_dependencies.rb index c2fc8cf..2daee37 100644 --- a/core/lib/leap_web_core/ui_dependencies.rb +++ b/core/lib/leap_web_core/ui_dependencies.rb @@ -1,5 +1,4 @@ require "haml" -require "bootstrap-sass" require "jquery-rails" require "simple_form" require "bootswatch-rails" |