diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:49:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 21:49:18 -0400 |
| commit | ed332693fea75ac5f95351e5cc2627ccfc21eb04 (patch) | |
| tree | cb96d7cd349ebdc93104ec05886d8256467cdaf7 /Gemfile.lock | |
| parent | 41a78be25e5b4d7b5f65cfbf4d6fba5184f41475 (diff) | |
| parent | 881e4277fdd5116037a86af3c711d4b6ceb240d4 (diff) | |
Merge branch 'master' into patch-1
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 |