mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-19 22:22:53 -05:00
e61a7794f8
Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Conflict because glitch-soc has a different list of allowed tags. Added upstream's new allowed tags while keeping ours. - `spec/requests/api/v1/timelines/public_spec.rb`: Conflict because of glitch-soc's default settings. Updated accordingly.