Claire 83480df820 Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream ... Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Upstream added `<s>` to the list of allowed tags, the conflict is because we have a different list of allowed tags. Added `<s>` like upstream did.		2024-08-12 17:46:24 +02:00
..
sanitize_config.rb	Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream	2024-08-12 17:46:24 +02:00