diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:38:37 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:38:37 -0400 |
commit | 7826b5e93d1937ac409c6499940fd83af2c12cd1 (patch) | |
tree | 1eaf1cc62022ca9fd46a057b8f76c00d3e099939 /Gemfile.lock | |
parent | 0209b7d1b52a2c44cf055c7d7a5209e98ffe04f8 (diff) | |
parent | fc7b8307190b8f472b526d99bc10db58153850d5 (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 |