diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:02:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:02:26 -0400 |
| commit | 9f43e3b428c0adea4af75fc4e340799954e42221 (patch) | |
| tree | ab2b6bb407ca6310d63b84af6f64ab4dca90a2dc /Gemfile | |
| parent | 8989569dd42aabd9c768927f0975401af89bceb3 (diff) | |
| parent | 4a40b40324aa50ec0c42d574f78bb45835dfe295 (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'] |