Merge branch 'main' into glitch-soc/merge-upstream

2022-10-08 15:49:40 +02:00
parent 2c8d1880cc 6580ac7241
commit 46224385e2
110 changed files with 495 additions and 474 deletions
--- a/2
+++ b/2
@@ -122,7 +122,7 @@ group :test do
  gem 'rspec-sidekiq', '~> 3.1'
  gem 'simplecov', '~> 0.21', require: false
  gem 'webmock', '~> 3.18'
-  gem 'rspec_junit_formatter', '~> 0.5'
+  gem 'rspec_junit_formatter', '~> 0.6'
 end

 group :development do