diff options
| author | Michel Etienne | 2012-06-29 10:11:36 +0200 |
|---|---|---|
| committer | Michel Etienne | 2012-06-29 10:11:36 +0200 |
| commit | 8ccb51a3fd3907388ccaa02652a50af5e2ac08e0 (patch) | |
| tree | 5144f13f0b6b4fbeb2fcad35a8d9f14f03a8331f /Gemfile.lock | |
| parent | 56de2324949f9035ccb30f0ddbf86a2b6b3aebc3 (diff) | |
| parent | 7159c4509e4b9e28786165339c9be1f465419b92 (diff) | |
| download | chouette-core-8ccb51a3fd3907388ccaa02652a50af5e2ac08e0.tar.bz2 | |
Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 97f1ed577..9739f9904 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -218,8 +218,7 @@ GEM treetop (~> 1.4.8) map_layers (0.0.5) mime-types (1.19) - modernizr (2.5.3) - sprockets (~> 2.0) + modernizr-rails (2.0.6) multi_json (1.3.6) net-scp (1.0.4) net-ssh (>= 1.99.1) @@ -381,7 +380,7 @@ DEPENDENCIES json launchy map_layers (~> 0.0.4) - modernizr + modernizr-rails (~> 2.0.6) ninoxe! pg (~> 0.11.0) rails (= 3.1.3) |