diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-01 14:36:06 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-01 14:36:06 +0200 |
| commit | 24d05c7a5020f0e8708f13cb21125a86e1ae5299 (patch) | |
| tree | e12c38119b74b4102493ae27451f4f308e0957a6 /Gemfile | |
| parent | c91d9b7389c489980fe98812a8f3884b2d41e19e (diff) | |
| parent | 793fb7499dd9fc651a02578ef664c9aa22b2758c (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile index 9826a59eb..ef2644eb2 100644 --- a/Gemfile +++ b/Gemfile @@ -62,7 +62,7 @@ gem 'nokogiri', '~> 1.8' gem 'nsa', '~> 0.2' gem 'oj', '~> 3.6' gem 'ostatus2', '~> 2.0' -gem 'ox', '~> 2.9' +gem 'ox', '~> 2.10' gem 'posix-spawn', git: 'https://github.com/rtomayko/posix-spawn', ref: '58465d2e213991f8afb13b984854a49fcdcc980c' gem 'pundit', '~> 1.1' gem 'premailer-rails' |