diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:15:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:15:55 -0400 |
| commit | 1b42f717f2c44bb0c85dfc8e8b40790b12d45993 (patch) | |
| tree | 852b1ccaeb7c5eeae530c66eb1a97462b2dd7831 /Gemfile.lock | |
| parent | eb98c99924ab810eea8a97040a82308f68c805cc (diff) | |
| parent | 7004c692040d9372c187a13a21f1215f07d3a8ff (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 |