mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-16 03:43:08 +00: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. |
||
---|---|---|
.. | ||
activitypub | ||
nodeinfo | ||
rest | ||
rss | ||
web | ||
initial_state_serializer.rb | ||
manifest_serializer.rb | ||
oembed_serializer.rb | ||
webfinger_serializer.rb |