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

Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml
2019-03-26 16:02:54 +01:00
parent 648cf8bfd5 0c1a05b281
commit b9f314bba7
161 changed files with 5988 additions and 2055 deletions
--- a/2
+++ b/2
@@ -15,7 +15,7 @@ gem 'makara', '~> 0.4'
 gem 'pghero', '~> 2.2'
 gem 'dotenv-rails', '~> 2.7'

-gem 'aws-sdk-s3', '~> 1.34', require: false
+gem 'aws-sdk-s3', '~> 1.35', require: false
 gem 'fog-core', '<= 2.1.0'
 gem 'fog-openstack', '~> 0.3', require: false
 gem 'paperclip', '~> 6.0'