diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-11 17:31:02 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-11 17:31:02 +0100 |
commit | f3e76341565e9455b755dd9f0529b444c7081abc (patch) | |
tree | fabbdcab9a68f7b7b702b5652c71351c62c250c4 /Gemfile | |
parent | a1c6e6de1b42ea1ecfa2bb188ab56ee5f73611ce (diff) | |
parent | c8122e84cc140f49d7bce0540b6e389781c0fdaf (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile index 5f40bd310..db2746413 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.30', require: false +gem 'aws-sdk-s3', '~> 1.31', require: false gem 'fog-core', '<= 2.1.0' gem 'fog-openstack', '~> 0.3', require: false gem 'paperclip', '~> 6.0' |