aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-04-24 16:21:40 +0100
committerLouise Crow <louise.crow@gmail.com>2013-04-24 16:21:40 +0100
commitdbd344ea60021982f25c2869f29e1ed42d0a9a91 (patch)
treee51b4b301dc2c07e24726fbc4eb279d81fabaaca
parent74f2baae968f467f026796e12d506ab557623406 (diff)
Results of running bundle install - reorder from merge.
-rw-r--r--Gemfile.lock5
1 files changed, 2 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index abb8ef8cd..580db8a76 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -249,11 +249,10 @@ DEPENDENCIES
fakeweb
fast_gettext
fastercsv (>= 1.5.5)
- globalize3!
gettext
gettext_i18n_rails
+ globalize3!
json
- launchy
locale
mahoro
mailcatcher
@@ -268,8 +267,8 @@ DEPENDENCIES
rdoc
recaptcha (~> 0.3.1)
rmagick
- rspec-rails
routing-filter
+ rspec-rails
ruby-debug
ruby-msg (~> 1.5.0)
spork-rails