diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:33:40 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:33:40 -0400 |
commit | d7d165db5b1b7b1959a36e1f0e3da875befc2574 (patch) | |
tree | 5be0ded23cf8a3190a3173bd5b16f4c4af77207f /Gemfile.lock | |
parent | 73b8e67f4b103fc3400064d153807d6d88f758d4 (diff) | |
parent | d7f4300ee3ff44a42453ea8042034d651a9789da (diff) |
Merge branch 'master' into add-infinimatix.net-instance
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 |