diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:54:32 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 21:54:32 -0400 |
commit | 7b7bff04df135aa76329696fbbceee9b80a70645 (patch) | |
tree | a535a961e2af14bdc013274717b8098516cfee64 /Gemfile | |
parent | a31f5765afb2598937b418cce0b5bacdf71c5ba8 (diff) | |
parent | e6596087977516270c8a805db962eb8b06e99d96 (diff) |
Merge branch 'master' into master
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'] |