summaryrefslogtreecommitdiff
path: root/core/lib
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2014-01-27 10:30:11 -0800
committerjessib <jessib@riseup.net>2014-01-27 10:30:11 -0800
commit7e0573f3347dca6323eae05127849431ecbceb77 (patch)
tree8a6ff58fdcc93493b5a8f332350b0a9292119906 /core/lib
parent3bfbf0ad20bb5b8e4689fda287cd47738571d10d (diff)
parentd578c07e196cd9758fbf1752a9bb8477c260bb30 (diff)
Merge branch 'develop' into feature/messages_api
Conflicts: users/config/locales/en.yml
Diffstat (limited to 'core/lib')
-rw-r--r--core/lib/leap_web_core/dependencies.rb1
-rw-r--r--core/lib/leap_web_core/ui_dependencies.rb1
2 files changed, 0 insertions, 2 deletions
diff --git a/core/lib/leap_web_core/dependencies.rb b/core/lib/leap_web_core/dependencies.rb
index e4a8807..877e3d1 100644
--- a/core/lib/leap_web_core/dependencies.rb
+++ b/core/lib/leap_web_core/dependencies.rb
@@ -9,7 +9,6 @@ module LeapWebCore
UI = {
"haml" => "~> 3.1.7",
- "bootstrap-sass" => "~> 2.0.4",
"jquery-rails" => nil,
"simple_form" => nil,
"bootswatch-rails", "~> 0.5.0"
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"