diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:13:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:13:06 -0400 |
| commit | cf13c97cb2890d7bf51540f632cf725f89baefd9 (patch) | |
| tree | d58925eed77815140c011bb70667fdc4b80173c5 /Gemfile | |
| parent | 65b3a2a5a6e3151cf4da89132326b796a5c0687a (diff) | |
| parent | 90a408f5927956f0cbe9b81812daca7b4a92d807 (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'] |