diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:34:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:34:45 -0400 |
| commit | cf03634e74364af3a703ea09073ab0a58448d460 (patch) | |
| tree | d4454c7feaa75a99532d4a5cd9bfdff8b4c8bf09 /Gemfile | |
| parent | 83530f0eef8f6cf04321b61c917da08ab0f4e323 (diff) | |
| parent | 698d74a15fe8db61de057b8876e9967e9e9c7330 (diff) | |
Merge branch 'master' into add-elao-com-instance
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'] |