diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:13:06 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:13:06 -0400 |
commit | cf13c97cb2890d7bf51540f632cf725f89baefd9 (patch) | |
tree | d58925eed77815140c011bb70667fdc4b80173c5 /Gemfile.lock | |
parent | 65b3a2a5a6e3151cf4da89132326b796a5c0687a (diff) | |
parent | 90a408f5927956f0cbe9b81812daca7b4a92d807 (diff) |
Merge branch 'master' into master
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 |