mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-18 00:23:51 -05:00
Conflicts: - `app/services/post_status_service.rb`: CW/sensitive logic fixed upstream, but different in glitch-soc. Ported the changes accordingly.