diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:42:14 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:42:14 -0400 |
commit | c9f15f79913f3b79153fc0750c3eeafd26c26154 (patch) | |
tree | 97f2bc485412e4b4fb85151a785299e5f233f636 /Gemfile | |
parent | 6a88151edaf34983385134d5930df8469692c207 (diff) | |
parent | 91afe1f8fd8ccc5ed086bb08f72a34eb484d3ba7 (diff) |
Merge branch 'master' into patch-1
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile index b5705e9d1..65bd5eb49 100644 --- a/Gemfile +++ b/Gemfile @@ -34,6 +34,7 @@ gem 'doorkeeper' gem 'rabl' gem 'rqrcode' gem 'twitter-text' +gem 'ox' gem 'oj' gem 'hiredis' gem 'redis', '~>3.2', require: ['redis', 'redis/connection/hiredis'] |