diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-31 00:37:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-31 00:37:16 +0100 |
| commit | 925830d11bb5c132e282f82bdb2ca893d87c9c24 (patch) | |
| tree | 324003d03c66caead9842a6052bc28caf7f654c2 /Gemfile.lock | |
| parent | b6fa500806f68d5394174e1f341dc61e3578760e (diff) | |
| parent | b72950fbd3536260df0b9c22179a6024d4d0c189 (diff) | |
Merge pull request #976 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bf41ea656..620651983 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.15.0) + capybara (3.16.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -672,7 +672,7 @@ DEPENDENCIES capistrano-rails (~> 1.4) capistrano-rbenv (~> 2.1) capistrano-yarn (~> 2.0) - capybara (~> 3.15) + capybara (~> 3.16) charlock_holmes (~> 0.7.6) chewy (~> 5.0) cld3 (~> 3.2.3) |