You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 33d30632fb Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/public_feed.rb`: Upstream refactored a bit, glitch-soc had specific code for local-only statuses. Updated glitch-soc's specific code accordingly.		4 years ago
..
base_controller.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
claims_controller.rb	…
collections_controller.rb	…
followers_synchronizations_controller.rb	Add follower synchronization mechanism (#14510)	4 years ago
inboxes_controller.rb	Skip processing Update activities on unknown accounts (#15514)	4 years ago
outboxes_controller.rb	…
replies_controller.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago