diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:49:18 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 21:49:18 -0400 |
commit | ed332693fea75ac5f95351e5cc2627ccfc21eb04 (patch) | |
tree | cb96d7cd349ebdc93104ec05886d8256467cdaf7 /Gemfile | |
parent | 41a78be25e5b4d7b5f65cfbf4d6fba5184f41475 (diff) | |
parent | 881e4277fdd5116037a86af3c711d4b6ceb240d4 (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'] |