diff options
| author | ThibG <thib@sitedethib.com> | 2019-01-25 22:42:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-25 22:42:21 +0100 |
| commit | 270bf7778d681453b259e54b5da55fb449365c8b (patch) | |
| tree | f94f595aa4347572fe7a62488c8bc90d56f94d2f /Gemfile | |
| parent | afec6b43eb856547ccc7083dbb677096d78821bf (diff) | |
| parent | 8ef0498f1ca4ff4dab7d8255f15577a86907c392 (diff) | |
Merge pull request #896 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 bf3c2b51d..51595a758 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ gem 'paperclip-av-transcoder', '~> 0.6' gem 'streamio-ffmpeg', '~> 3.0' gem 'active_model_serializers', '~> 0.10' -gem 'addressable', '~> 2.5' +gem 'addressable', '~> 2.6' gem 'bootsnap', '~> 1.3', require: false gem 'browser' gem 'charlock_holmes', '~> 0.7.6' |