diff options
author | David Yip <yipdw@member.fsf.org> | 2017-12-12 02:54:13 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-12-12 02:54:13 -0600 |
commit | a057ed5cfea2c1c4fb21984cadae993740fb25e0 (patch) | |
tree | c965f135b8c46f679eb22e80a37550c8b985b9ea /Gemfile | |
parent | 04eaa1943f002865f8a0234e19c6ea4cc1d3bb6a (diff) | |
parent | 14c4a33cd9bfc1212cb362897272e5ea7d1529e5 (diff) |
Merge remote-tracking branch 'tootsuite/master' into 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 e43b1a256..f6acb431a 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,7 @@ gem 'pg', '~> 0.20' gem 'pghero', '~> 1.7' gem 'dotenv-rails', '~> 2.2' -gem 'fog-aws', '~> 1.4', require: false +gem 'aws-sdk', '~> 2.10', require: false gem 'fog-core', '~> 1.45' gem 'fog-local', '~> 0.4', require: false gem 'fog-openstack', '~> 0.1', require: false |