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.		2020-11-08 14:20:35 +01:00
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
nodeinfo	Add `openRegistrations` attribute to nodeinfo endpoint (#12058)	2019-10-02 21:02:48 +02:00
rest	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-07 18:23:02 +01:00
rss	Improve RSS entries for statuses (#13592)	2020-05-10 09:50:54 +02:00
web	Only display web push notifications after API call (fixes #7902) (#8396)	2018-08-23 21:44:27 +02:00
initial_state_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-10-21 19:10:50 +02:00
manifest_serializer.rb	Add method and enctype to manifest (#11767)	2019-09-05 15:51:51 +02:00
oembed_serializer.rb	Improve RSS entries for statuses (#13592)	2020-05-10 09:50:54 +02:00
webfinger_serializer.rb	Remove XML version of Webfinger and remove links to Atom feeds (#11460)	2019-08-01 19:14:02 +02:00