diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:14:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:14:08 -0400 |
| commit | 9981972844401f5f1f91e3452943eb4b8999699a (patch) | |
| tree | a38b3333ea5f711efe286fcdda2237b348ad21ff /Gemfile | |
| parent | 6b41fb2e6ffa11aa70d14600ad26575bf9aec112 (diff) | |
| parent | 5f61ef24175b5f20bc6e384418413ed2967d17dc (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'] |