diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-07-22 20:49:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-22 20:49:54 +0200 |
| commit | 85d0e3474574d82fc653925560d2905cee43287e (patch) | |
| tree | 20a7c49c820e8b5b7e2389408b6d8deb55fa1119 /Gemfile.lock | |
| parent | 0a61b000e3f10e9be3d8ae1cccf53caa3877a55a (diff) | |
| parent | 1ceebf2710794dc35211a16ad3af7f834641a2ab (diff) | |
Merge pull request #1810 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
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 e334d5733..b16d38d38 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -407,7 +407,7 @@ GEM net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.1.0) nio4r (2.5.8) - nokogiri (1.13.6) + nokogiri (1.13.7) mini_portile2 (~> 2.8.0) racc (~> 1.4) nsa (0.2.8) @@ -415,7 +415,7 @@ GEM concurrent-ruby (~> 1.0, >= 1.0.2) sidekiq (>= 3.5) statsd-ruby (~> 1.4, >= 1.4.0) - oj (3.13.16) + oj (3.13.17) omniauth (1.9.1) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) |