diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-26 16:02:54 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-26 16:02:54 +0100 |
| commit | b9f314bba754074c7ac7dad37cdd35a0cbf1d1b5 (patch) | |
| tree | 987f8ceff468686d7f4185cf2312e56aed45ecd1 /Gemfile | |
| parent | 648cf8bfd51913929b7d0d3a637de496d6e40f89 (diff) | |
| parent | 0c1a05b281c2665b52a644d51b9b06c2756479a7 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile index 1a2c2f78f..b944ff258 100644 --- a/Gemfile +++ b/Gemfile @@ -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' |