diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-16 17:10:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-16 17:10:27 +0100 |
| commit | 6af2300454c960ef83f7b7d31e9b829e0d5a8e38 (patch) | |
| tree | 97325ab7ad5a572170637da7a72ba72b7231a02f /Gemfile | |
| parent | c2fa0f7c40bcc4064e8baaa221665eadd391c001 (diff) | |
| parent | 0fbe90e2d3cfc2c5d1fd12ea564daa52a83ec0ac (diff) | |
Merge pull request #961 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile index db2746413..9b08ab780 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.31', require: false +gem 'aws-sdk-s3', '~> 1.32', require: false gem 'fog-core', '<= 2.1.0' gem 'fog-openstack', '~> 0.3', require: false gem 'paperclip', '~> 6.0' @@ -87,7 +87,7 @@ gem 'tty-command', '~> 0.8', require: false gem 'tty-prompt', '~> 0.18', require: false gem 'twitter-text', '~> 1.14' gem 'tzinfo-data', '~> 1.2018' -gem 'webpacker', '~> 3.5' +gem 'webpacker', '~> 4.0' gem 'webpush' gem 'json-ld', '~> 3.0' |