mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-20 14:42:58 -05:00
51631c785f
Conflicts: - `app/lib/activitypub/parser/status_parser.rb`: Glitch-soc had changes to adjacent lines. Ported upstream's changes.