diff options
| author | Erwan Leboucher <erwanleboucher@gmail.com> | 2017-04-07 12:43:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 12:43:56 +0200 |
| commit | 0c4e9fdda051d0322608c9abdaa158529c8feacd (patch) | |
| tree | db5e8aae085529913e4567c0a81a00c1d2b22356 /Gemfile | |
| parent | a0f1f9c6649f44183b9c1525433c1c6e7f052492 (diff) | |
| parent | 624a9a7136159d460228a0c2f5df18a9ead3b7f2 (diff) | |
Merge branch 'master' into patch-4
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'] |