diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-04 23:17:11 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-04 23:17:11 +0000 |
| commit | c69a23ae4668bad91e3992dbd72e7b3a62427bf9 (patch) | |
| tree | fc8e594f6f9ecc1dd5cb13c491aa17c372adb587 /Gemfile.lock | |
| parent | fc884d015a1a2d6c31976af3d63039390fa15939 (diff) | |
| parent | d872902997c29e228001b71a4a3ede589e346f5d (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 58c59ad35..f6986cb4d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -299,13 +299,11 @@ GEM sidekiq (>= 3.5.0) statsd-ruby (~> 1.2.0) oj (3.3.9) - openssl (2.0.6) orm_adapter (0.5.0) - ostatus2 (2.0.1) + ostatus2 (2.0.2) addressable (~> 2.4) http (~> 2.0) nokogiri (~> 1.6) - openssl (~> 2.0) ox (2.8.2) paperclip (5.1.0) activemodel (>= 4.2.0) |