diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:44:40 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:44:40 -0400 |
commit | abab82ec1e086e257650ceed3d03a4d881e0a12e (patch) | |
tree | a8b7db83af6b84813c5bd951d38ca0334acb9af7 /Gemfile.lock | |
parent | 07495cc13feb78ae979a8af69a401cce8dcd4e8d (diff) | |
parent | f0797bf8cecd7d8537747bff66fc0363ccc59760 (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 |