FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/lib/activitypub
History
Thibaut Girka e5f934ddf0 Merge branch 'master' into glitch-soc/merge-upstream 
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.
 		2020-09-07 09:21:38 +02:00
..
activity
…
activity.rb
…
adapter.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-09-07 09:21:38 +02:00
case_transform.rb
…
dereferencer.rb
…
linked_data_signature.rb
…
serializer.rb
…
tag_manager.rb
…