Merge branch 'master' into glitch-soc/merge-upstream

2019-01-25 11:37:49 +01:00
parent afec6b43eb e1ec3a9f09
commit 04e2c67389
7 changed files with 42 additions and 13 deletions
--- a/2
+++ b/2
@@ -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'