diff options
| author | Teddy Wing | 2017-06-14 18:37:50 +0200 |
|---|---|---|
| committer | Teddy Wing | 2017-06-14 18:37:50 +0200 |
| commit | 467f787eb36b68f809409ec3a01797af30fe5128 (patch) | |
| tree | c356ce51ba8990f86a3ecce737985442f9d1e602 /Gemfile.lock | |
| parent | 8c9eb5e1108f4d7e182c9984d667ed7cf4adc006 (diff) | |
| parent | b7fac062e4a0fcaf485ff7c848f161f99f020a5f (diff) | |
| download | chouette-core-467f787eb36b68f809409ec3a01797af30fe5128.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into 3479-refactor-table_builder-helper
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 921f0f367..eea6f4ba5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,10 +9,10 @@ GIT GIT remote: git@github.com:af83/stif-codifline-api.git - revision: 02108a647514ca36e4377deecf3ffcce99359139 + revision: c0efb26bf202e0770348bdac060b14c28e575ac2 specs: codifligne (0.0.2) - nokogiri (~> 1.6) + nokogiri (>= 1.7.2) GIT remote: git@github.com:af83/stif-reflex-api.git @@ -309,7 +309,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.2) - mini_portile2 (2.1.0) + mini_portile2 (2.2.0) minitest (5.10.1) multi_json (1.12.1) multi_test (0.1.2) @@ -323,8 +323,8 @@ GEM net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) newrelic_rpm (4.0.0.332) - nokogiri (1.7.1) - mini_portile2 (~> 2.1.0) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) open4 (1.3.4) orm_adapter (0.5.0) parser (2.4.0.0) |