diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-26 19:12:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-26 19:12:07 +0200 |
| commit | af934b90710a2ce1099d3ceda5de7bcf0e94595c (patch) | |
| tree | 71e25690e6300d0235d515ccd0241d082c8d1abe /Gemfile | |
| parent | 2903f8f36b7c41b77de4ad6c8c5b0a6c0b2a7ace (diff) | |
| parent | be20eb4b2f4e55c472263a98a2c07b4e805d9bd5 (diff) | |
Merge pull request #674 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile index 760ecbc7c..e781da8ae 100644 --- a/Gemfile +++ b/Gemfile @@ -41,7 +41,7 @@ gem 'omniauth-cas', '~> 1.1' gem 'omniauth-saml', '~> 1.10' gem 'omniauth', '~> 1.2' -gem 'doorkeeper', '~> 4.4' +gem 'doorkeeper', '~> 5.0' gem 'fast_blank', '~> 1.0' gem 'fastimage' gem 'goldfinger', '~> 2.1' |