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 64ef99a31e 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
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
nodeinfo	Add `openRegistrations` attribute to nodeinfo endpoint (#12058)	5 years ago
rest	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
rss	Improve RSS entries for statuses (#13592)	5 years ago
web	Only display web push notifications after API call (fixes #7902) (#8396)	6 years ago
initial_state_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
manifest_serializer.rb	Add method and enctype to manifest (#11767)	5 years ago
oembed_serializer.rb	Improve RSS entries for statuses (#13592)	5 years ago
webfinger_serializer.rb	Remove XML version of Webfinger and remove links to Atom feeds (#11460)	5 years ago