diff options
| author | Luc Donnet | 2017-09-27 09:56:59 +0200 |
|---|---|---|
| committer | Luc Donnet | 2017-09-27 09:56:59 +0200 |
| commit | 16fc6a184311c0ab5e1463398b91f8a716bcf4db (patch) | |
| tree | eea2b4b703c6e7960077a0ad1f1b61e079822950 /Gemfile.lock | |
| parent | 7ec5867ec7bd7365bb4c97d7d4c1bdc2cf580bc2 (diff) | |
| parent | 28a42fb19174eafee38fe3c5f8fa58f89991f44a (diff) | |
| download | chouette-core-16fc6a184311c0ab5e1463398b91f8a716bcf4db.tar.bz2 | |
Merge branch 'master' of github.com:AF83/stif-boiv
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9a7be2d84..62b7e3c99 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -305,7 +305,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.2) - mini_portile2 (2.2.0) + mini_portile2 (2.3.0) minitest (5.10.3) multi_json (1.12.1) multi_test (0.1.2) @@ -319,8 +319,8 @@ GEM net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) newrelic_rpm (4.0.0.332) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) open4 (1.3.4) orm_adapter (0.5.0) parser (2.4.0.0) |