mirror of https://github.com/tootsuite/mastodon
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. |
||
---|---|---|
.. | ||
activity | ||
activity.rb | ||
adapter.rb | ||
case_transform.rb | ||
dereferencer.rb | ||
linked_data_signature.rb | ||
serializer.rb | ||
tag_manager.rb |