diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-11-30 20:16:26 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-11-30 20:16:26 +0100 |
commit | bc8411ec870e579bd2411827f3b8a1d4ecf44796 (patch) | |
tree | b203a43bcb54017dcb24a3937f6e0aa767e225d2 /Gemfile.lock | |
parent | b65daa25faab0fbefd367b3cbbe4d32bfd8c5820 (diff) | |
parent | bfec030a4e3be37e4986d7ec5cb1bda968ba549a (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
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 b6be4de68..467fc3692 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -210,7 +210,7 @@ GEM faraday (0.15.0) multipart-post (>= 1.2, < 3) fast_blank (1.0.0) - fastimage (2.1.4) + fastimage (2.1.5) ffi (1.9.25) fog-core (2.1.0) builder @@ -361,7 +361,7 @@ GEM concurrent-ruby (~> 1.0.0) sidekiq (>= 3.5.0) statsd-ruby (~> 1.2.0) - oj (3.7.1) + oj (3.7.4) omniauth (1.8.1) hashie (>= 3.4.6, < 3.6.0) rack (>= 1.6.2, < 3) |