about summary refs log tree commit diff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorShel R <Yiskah.Raphen@gmail.com>2017-04-07 21:59:21 -0400
committerGitHub <noreply@github.com>2017-04-07 21:59:21 -0400
commit4c05f0e630aacad594e7b21147340e2c0a0ac8ad (patch)
tree4ef28c2f42dd8e4cdfd9815dd6550b5bd2601f36 /Gemfile.lock
parent96812a6c792c8b048ed8d4a50351d9696dcf0f77 (diff)
parentd438eab67301e767bdd040c6f9bd831c92214656 (diff)
Merge branch 'master' into patch-1
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock2
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