diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-12 14:33:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-12 14:33:01 +0100 |
| commit | f61137b7ffb97006ab811f8a4bce017b5f07f85d (patch) | |
| tree | ff70b757d86a44665d16c8021cb81f8e04f396a7 /Gemfile.lock | |
| parent | 28ec7def5869ff1a85f49a070b9575c166a432ee (diff) | |
| parent | f4db2e1832e40cbdfd81feda24fcf87c96f6dbd5 (diff) | |
Merge pull request #1688 from ClearlyClaire/glitch-soc/merge-upstream
Merge 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 fade57c3e..c60943a8d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -436,7 +436,7 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.6) - puma (5.6.1) + puma (5.6.2) nio4r (~> 2.0) pundit (2.1.1) activesupport (>= 3.0.0) |