diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:49:14 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:49:14 -0400 |
commit | b67b60fec3adecffef544924a7776cce9b0a2633 (patch) | |
tree | b592548a0a8cc6e9f1cbdf91df04e197503c070f /Gemfile.lock | |
parent | acf6436a993b514aa2fffffb8a03d3718c5a49a0 (diff) | |
parent | cc16fa75137586dff8eb1ef4e508aed81bf21718 (diff) |
Merge branch 'master' into patch-2
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 408d85ade..f2a199931 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -240,6 +240,7 @@ GEM addressable (~> 2.4) http (~> 2.0) nokogiri (~> 1.6) + ox (2.4.11) paperclip (5.1.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) @@ -482,6 +483,7 @@ DEPENDENCIES nokogiri oj ostatus2 + ox paperclip (~> 5.1) paperclip-av-transcoder pg |