diff options
| author | foxiehkins <foxiehkins@gmail.com> | 2017-04-07 14:01:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 14:01:20 +0100 |
| commit | 41396de7a90f23dd0afe1afa3dab1be43b7b6ecd (patch) | |
| tree | 5cacec3a442a671990f972196fa90c90903e83cf /Gemfile | |
| parent | ac1989d2c07b707699641987d62697103698393c (diff) | |
| parent | 4e41cd9ab8f51120d558b70528b163c98993be53 (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'] |