summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2012-10-17 10:12:11 -0700
committerjessib <jessib@riseup.net>2012-10-17 10:12:11 -0700
commitc072a2fe1d50715bad1cd8c14213cba6aa1cc8ff (patch)
tree14a599dadbe440952c0de73c487113bc09aa9142 /Gemfile.lock
parent171d07a64d3f76e68c22f0fb4cc3795daad806d1 (diff)
parentd9a510fa2126c29f0af58c6bbeff35802777eee6 (diff)
Merge branch 'develop' into help_develop
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock8
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 137e6d7..86cb8e8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -25,7 +25,7 @@ PATH
specs:
leap_web_users (0.1.0)
leap_web_core (= 0.1.0)
- ruby-srp (~> 0.1.1)
+ ruby-srp (~> 0.1.3)
GEM
remote: https://rubygems.org/
@@ -59,7 +59,7 @@ GEM
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.2)
- bootstrap-sass (2.0.4.2)
+ bootstrap-sass (2.1.0.0)
builder (3.0.3)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
@@ -143,7 +143,7 @@ GEM
ruby-debug-base (~> 0.10.4.0)
ruby-debug-base (0.10.4)
linecache (>= 0.3)
- ruby-srp (0.1.1)
+ ruby-srp (0.1.3)
sass (3.2.1)
sass-rails (3.2.5)
railties (~> 3.2.0)
@@ -172,7 +172,7 @@ PLATFORMS
ruby
DEPENDENCIES
- bootstrap-sass (~> 2.0.4)
+ bootstrap-sass (~> 2.1.0)
coffee-rails (~> 3.2.2)
haml (~> 3.1.7)
haml-rails (~> 0.3.4)