diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-30 19:17:17 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-30 19:17:17 +0000 |
| commit | f0bb3ff53307aac7b9c64ec8a48d4ba1d2019513 (patch) | |
| tree | 42a5d4f630f5afe0c2aee7e53fbdbe5751cb1fb6 /Gemfile.lock | |
| parent | 01bad04efd09ede8c31c578259468be329e4fc3c (diff) | |
| parent | e573bb0990ece4b1a521ccf8a4c7bec5972d3538 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
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 72f706295..be623923a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -113,7 +113,7 @@ GEM xpath (~> 2.0) case_transform (0.2) activesupport - charlock_holmes (0.7.5) + charlock_holmes (0.7.6) chewy (5.0.0) activesupport (>= 4.0) elasticsearch (>= 2.0.0) @@ -635,7 +635,7 @@ DEPENDENCIES capistrano-rbenv (~> 2.1) capistrano-yarn (~> 2.0) capybara (~> 2.15) - charlock_holmes (~> 0.7.5) + charlock_holmes (~> 0.7.6) chewy (~> 5.0) cld3 (~> 3.2.0) climate_control (~> 0.2) |