aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
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 c6f9c96ee..51f736b50 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -66,7 +66,7 @@ GEM
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
charlock_holmes (0.6.9.4)
- chunky_png (1.2.8)
+ chunky_png (1.3.3)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
@@ -80,8 +80,8 @@ GEM
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
- compass-rails (1.0.3)
- compass (>= 0.12.2, < 0.14)
+ compass-rails (2.0.0)
+ compass (>= 0.12.2)
coveralls (0.6.7)
colorize
multi_json (~> 1.3)
@@ -292,7 +292,7 @@ DEPENDENCIES
capistrano
charlock_holmes
coffee-rails (~> 3.2.1)
- compass-rails
+ compass-rails (= 2.0.0)
coveralls
debugger
dynamic_form