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 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		4 years ago
..
base_controller.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
claims_controller.rb	Add E2EE API (#13820)	5 years ago
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	Skip processing Update activities on unknown accounts (#15514)	4 years ago
outboxes_controller.rb	Fix anonymous access to outbox not being cached by the reverse proxy (#16458)	4 years ago
replies_controller.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago