diff options
| author | Michel Etienne | 2014-06-24 16:41:49 +0200 |
|---|---|---|
| committer | Michel Etienne | 2014-06-24 16:41:49 +0200 |
| commit | 7909f7db83dbdeee280a7010bdf0a90d2b7e7e95 (patch) | |
| tree | 58be95372f7f7d77643af8e14dc0ce65d604cd0d /Gemfile.lock | |
| parent | 3d046b1a470712836a2bfe15f0be46cd8cc5c73b (diff) | |
| parent | e511535bcca2e090899db2f697c1d9ceac8c4c9b (diff) | |
| download | chouette-core-7909f7db83dbdeee280a7010bdf0a90d2b7e7e95.tar.bz2 | |
merge V2_4
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 21da94f80..a8df89521 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/afimb/ninoxe.git - revision: 81104810ace190584d6b445de0d0948bc204b7b5 + revision: a0605b6d5430cf8e870f944ac2a34163a69a8e87 specs: ninoxe (1.0.1) - activerecord (>= 3.1.3) + activerecord (>= 3.1.3, < 4.0) acts_as_list (~> 0.1.6) foreigner (= 1.6.0) georuby-ext (= 0.0.5) @@ -123,9 +123,9 @@ GEM factory_girl (~> 2.6.0) railties (>= 3.0.0) fastercsv (1.5.5) - ffi (1.0.11) - ffi (1.0.11-java) - ffi-geos (0.4.0) + ffi (1.9.3) + ffi (1.9.3-java) + ffi-geos (1.0.0) ffi (>= 1.0.0) font-awesome-sass (4.1.0) sass (~> 3.2) |