diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:46:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:46:36 -0400 |
| commit | e7d7a99fbc78c7dbf763279aa4262580cabd8e1f (patch) | |
| tree | 6f1fce572c176a73aeacffa948c51ca3bf797596 /Gemfile | |
| parent | f0d1107c530d43432f2e19a2c74aff6cdfbd2b83 (diff) | |
| parent | 8d27de32b31f1093ab7c6eb177dfb9b866a1203e (diff) | |
Merge branch 'master' into patch-1
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'] |