diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-05-18 09:40:17 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-05-18 09:40:17 +0200 |
commit | f3d96d4ecbf181f185ff4b0aa44110b965e31133 (patch) | |
tree | 0fce8a159ec04f6d17d1f36e53a485baa0accf0b /Gemfile.lock | |
parent | 567745c1e66593ef46a86dc0bcfe824cefb04f14 (diff) | |
parent | 08d6a7764ffb957b2ee442dd75b54c295c013588 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0ff28ff43..e58612224 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -364,7 +364,7 @@ GEM net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.1.0) nio4r (2.5.7) - nokogiri (1.11.3) + nokogiri (1.11.4) mini_portile2 (~> 2.5.0) racc (~> 1.4) nokogumbo (2.0.4) @@ -428,7 +428,7 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.6) - puma (5.3.0) + puma (5.3.1) nio4r (~> 2.0) pundit (2.1.0) activesupport (>= 3.0.0) |