diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:09:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:09:55 -0400 |
| commit | 6efaee30b159313a72d0433d562d364ede2f513c (patch) | |
| tree | 18d62573ed68ce653879aa116729be1f37085ae1 /Gemfile.lock | |
| parent | e5566ac6a6462c0a8a6c6c8f2a1171087bd662a4 (diff) | |
| parent | 698fe3686a8e9a76ae21660d7504a229564d4594 (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 |