612158f4f6
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. |
||
---|---|---|
.. | ||
base_controller.rb | ||
claims_controller.rb | ||
collections_controller.rb | ||
inboxes_controller.rb | ||
outboxes_controller.rb | ||
replies_controller.rb |