diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-06-24 15:33:41 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-06-24 15:33:41 +0200 |
commit | aae60a2366d6dadbcc4a0197d4dd17afc931c8a0 (patch) | |
tree | 0bbbc278809d9990365a2d79abeaf02891990d51 /Gemfile.lock | |
parent | 5d12b63e79953a7596ae473706985b774d4e51a6 (diff) | |
parent | bb9ca8a587ee5a3ec8778e72828aca0ba8871327 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b47ab0091..c3269e108 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -93,7 +93,7 @@ GEM cocaine (~> 0.5.3) aws-eventstream (1.1.0) aws-partitions (1.329.0) - aws-sdk-core (3.99.2) + aws-sdk-core (3.100.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) |