mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-07 23:42:11 -05:00
Conflicts: - `spec/lib/sanitize/config_spec.rb`: Conflict due to glitch-soc having factored the file differently. Ported upstream's changes.