diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:17:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:17:53 -0400 |
| commit | 3e8c1a1c36b9d5cba96968d351cae2e2eefc3d22 (patch) | |
| tree | 691bb470a0811e28b2ebd5d32255048a7df763b3 /Gemfile | |
| parent | 7aede8e72092fa2b8846f2212dff411247a841b1 (diff) | |
| parent | 9fd8bbe15c18e0931ccf2c00fb6a1e69acfb0b0c (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'] |