mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-19 14:12:54 -05:00
83480df820
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.