mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-14 03:32:56 -05:00
e5f934ddf0
Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict caused because we have additional code to make sure pinned local-only toots don't get rendered on the ActivityPub endpoints. Ported upstream changes.