diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:43:13 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:43:13 -0400 |
commit | 38c51309300790e0f4a3fed0ede387c1765633a6 (patch) | |
tree | 5fc14c684d9ee4b21eb7710c491b3573df6e0034 /Gemfile | |
parent | b5d87500d2600eb8a0a56b0caeca5c7be388df19 (diff) | |
parent | ee8af9083ae83c6c642fa00aff040fb971f13470 (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'] |