diff options
| author | ThibG <thib@sitedethib.com> | 2019-04-04 15:13:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-04 15:13:18 +0200 |
| commit | 30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77 (patch) | |
| tree | e6022023d42dde628bb44880659104a87f985039 /Gemfile.lock | |
| parent | 14bad3f472b2d9887db701409db93e511e9c6f50 (diff) | |
| parent | be6885eb93c088699465d1c50e49e8ba6d9fa3a7 (diff) | |
Merge pull request #981 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 620651983..a4b76c796 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -127,7 +127,7 @@ GEM sshkit (~> 1.3) capistrano-yarn (2.0.2) capistrano (~> 3.0) - capybara (3.16.0) + capybara (3.16.1) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -254,7 +254,7 @@ GEM hashdiff (0.3.7) hashie (3.6.0) heapy (0.1.4) - highline (2.0.0) + highline (2.0.1) hiredis (0.6.3) hkdf (0.3.0) html2text (0.2.1) @@ -274,7 +274,7 @@ GEM rainbow (>= 2.0.0) i18n (1.6.0) concurrent-ruby (~> 1.0) - i18n-tasks (0.9.28) + i18n-tasks (0.9.29) activesupport (>= 4.0.2) ast (>= 2.1.0) erubi @@ -395,7 +395,7 @@ GEM parallel (1.14.0) parallel_tests (2.28.0) parallel - parser (2.6.0.0) + parser (2.6.2.0) ast (~> 2.4.0) pastel (0.7.2) equatable (~> 0.5.0) |