Claire daab277c0e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Upstream-updated lib textually too close to glitch-soc-only dep. Updated like upstream.		2022-01-28 08:58:32 +01:00
..
development.rb	Fix warnings on Rails boot (#16946)	2021-12-27 00:47:20 +01:00
production.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-26 22:32:21 +01:00
test.rb	Fix Sidekiq warnings about JSON serialization (#17381)	2022-01-28 00:43:56 +01:00