diff options
| author | Marc Florisson | 2014-09-03 17:27:46 +0200 |
|---|---|---|
| committer | Marc Florisson | 2014-09-03 17:27:46 +0200 |
| commit | e96068a9b88e59778dc4f193fbd8ae175d48754e (patch) | |
| tree | 60334401fdb6995f9c7628643c4010399825b589 | |
| parent | d7cb286c6af0b542ed5c91614424cc4b735053dc (diff) | |
| parent | dcd05fe04880db13f15dada3727b9594dbcd9ae5 (diff) | |
| download | chouette-core-e96068a9b88e59778dc4f193fbd8ae175d48754e.tar.bz2 | |
Merge branch 'sismo' of github.com:afimb/chouette2 into sismo
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8dafca210..cded9eae6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/afimb/ninoxe.git - revision: 3727e7393fdece893e1baa49916be24140c766b9 + revision: e93ee6b1b3867f9c8f7a4228654027408e50aa57 branch: sismo specs: ninoxe (1.1.0) @@ -52,8 +52,8 @@ GEM activesupport (3.2.18) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - acts-as-taggable-on (3.3.0) - activerecord (>= 3, < 5) + acts-as-taggable-on (3.4.1) + activerecord (>= 3.2, < 5) acts_as_list (0.1.6) acts_as_tree-1.8 (1.1.0) activerecord (>= 3.0.0) @@ -343,7 +343,7 @@ GEM polyglot polyglot (>= 0.3.1) typeahead-rails (0.10.5) - tzinfo (0.3.40) + tzinfo (0.3.41) uglifier (1.2.7) execjs (>= 0.3.0) multi_json (~> 1.3) |