diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-05-28 17:45:06 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-05-28 17:45:06 +0200 |
| commit | 3d73d76e551193a9beffec7a8cdf67e3d18978cf (patch) | |
| tree | cf2f72e84c0b99b9130ced6ee1dcd831756e7361 /Gemfile.lock | |
| parent | 1b0ce85e3da4b5c1941f65da7d73258da6eed6d0 (diff) | |
| parent | b793722d7d7df856466331729d523c807273b003 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 4b29a2be8..7fb6e8110 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -384,7 +384,7 @@ GEM addressable (~> 2.5) http (~> 3.0) nokogiri (~> 1.8) - ox (2.10.0) + ox (2.10.1) paperclip (6.0.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) |