Thibaut Girka 9604766a18 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/rest/account_serializer.rb`: Upstream added code too close to glitch-soc-specific followers-hiding code. Ported upstream changes.		2020-01-27 15:46:50 +01:00
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	2019-12-07 12:28:59 +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-01-27 15:46:50 +01:00
rss	Split AccountsHelper from StatusesHelper (#12078)	2019-10-24 22:50:09 +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	2019-10-27 12:14:01 +01:00
manifest_serializer.rb	Add method and enctype to manifest (#11767)	2019-09-05 15:51:51 +02:00
oembed_serializer.rb	Add allowfullscreen attribute to oembed iframe (#10370)	2019-03-25 15:01:09 +01:00
webfinger_serializer.rb	Remove XML version of Webfinger and remove links to Atom feeds (#11460)	2019-08-01 19:14:02 +02:00