diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 23:08:41 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 23:08:41 -0400 |
commit | 315ff648c8ab9f3bb34e2b6b1f77453159e260c4 (patch) | |
tree | b3793cec5458e83ad0d7053d7f85a174d05a5523 /Gemfile.lock | |
parent | 94536af96d9884e2acb2c34d0cf8948b1de7dd5d (diff) | |
parent | 41923d1c6ba28df6652aefd9619acc33a5cf467a (diff) |
Merge branch 'master' into list-oulipo-social
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 |