diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-28 19:33:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-28 19:33:15 +0200 |
| commit | 2f83ffa1bd1a80567c512db79273dc75d32ef069 (patch) | |
| tree | 69cd5f99ace6fbf0118bd46c504b18ba6edef232 /Gemfile.lock | |
| parent | 1b0ce85e3da4b5c1941f65da7d73258da6eed6d0 (diff) | |
| parent | 56d8faab1856f9cff8520518a145b256e7799c36 (diff) | |
Merge pull request #1073 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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) |