mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-19 08:31:44 +01:00
7b435fd9bf
Conflicts: - `app/services/post_status_service.rb`: CW/sensitive logic fixed upstream, but different in glitch-soc. Ported the changes accordingly.