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.

Thibaut Girka 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/follower_accounts_controller.rb`: Conflict due to upstream changing suspension logic while glitch-soc has an extra option to hide followers count. Ported upstream changes.		4 years ago
..
base_controller.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
claims_controller.rb	…
collections_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
followers_synchronizations_controller.rb	Add follower synchronization mechanism (#14510)	4 years ago
inboxes_controller.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
outboxes_controller.rb	Change REST API to return empty data for suspended accounts (#14765)	4 years ago
replies_controller.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago