aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Etienne2012-05-21 13:21:31 +0200
committerMichel Etienne2012-05-21 13:21:31 +0200
commit4a9800ece0e6ed71110d7d796c34e637f2f866d5 (patch)
tree386c13bbf89d4b4e06595e5240b3e3d2ede3662c
parent1cc9e0a809793cc87ce593e842f2bce9c14cc06b (diff)
downloadchouette-core-4a9800ece0e6ed71110d7d796c34e637f2f866d5.tar.bz2
synchro Gemfile.lock
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 01a35a77e..35c7abe78 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -159,7 +159,6 @@ GEM
factory_girl_rails (1.7.0)
factory_girl (~> 2.6.0)
railties (>= 3.0.0)
- ffi (1.0.11)
ffi (1.0.11-java)
ffi-geos (0.0.4)
ffi (~> 1.0.0)
@@ -188,6 +187,7 @@ GEM
jruby-openssl (0.7.6.1)
bouncy-castle-java (>= 1.5.0146.1)
jruby-rack (1.1.5)
+ json (1.7.3)
json (1.7.3-java)
json_pure (1.7.3)
launchy (2.1.0)