Jeremy Kescher 03f50f2f00 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # app/javascript/flavours/glitch/features/ui/components/link_footer.js # lib/mastodon/version.rb # public/avatars/original/missing.png		2022-11-06 20:59:47 +01:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
nodeinfo	Add “services” and “metadata” to NodeInfo (#18563)	2022-06-01 16:24:07 +02:00
rest	Improve min poll options, expose value in API	2022-11-01 10:29:44 +01:00
web	Fix web push notifications containing HTML entities (#18071)	2022-04-23 21:47:43 +02:00
initial_state_serializer.rb	Merge remote-tracking branch 'upstream/main' into develop	2022-11-06 20:59:47 +01:00
manifest_serializer.rb	Change floating action button to be a button in header in web UI (#19422)	2022-10-23 15:58:24 +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