mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-31 06:21:50 +01:00
9c34090db8
Conflicts: - `app/services/process_mentions_service.rb`: glitch-soc local-only handling, ported upstream changes