mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-03-17 17:00:45 -04:00
Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Upstream enforced new code style rules, where we had different code. Applied the new code style rules.