diff options
| author | Marc Florisson | 2012-09-06 10:31:18 +0200 |
|---|---|---|
| committer | Marc Florisson | 2012-09-06 10:31:18 +0200 |
| commit | 65f44388bd45b3d996e527e2abd19f4543aa00a7 (patch) | |
| tree | 9f02c07b456e09d45c7927625ae9cc8f27e282c1 /Gemfile.lock | |
| parent | 09500773ee2bdb67719ffa0a6e529107a7cfc663 (diff) | |
| parent | a54aa55e7d435ff0974c15723038278009a69683 (diff) | |
| download | chouette-core-65f44388bd45b3d996e527e2abd19f4543aa00a7.tar.bz2 | |
Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e8929de66..5af91e2b9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://chouette.dryade.priv/ninoxe - revision: 55d3c3c3f8dde90dc1b30224cefbe679a4ee9786 + revision: ddc6b0f9adfb2df8aa2b521d6a749c229977383c specs: ninoxe (0.0.8) GeoRuby @@ -195,7 +195,6 @@ GEM jruby-rack (1.1.9) jruby-rack-worker (0.4-java) jruby-rack (>= 1.1.1) - json (1.7.5) json (1.7.5-java) json_pure (1.7.5) launchy (2.1.0) |