Jeremy Kescher b221a857f7 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml		2022-11-17 23:38:08 +01:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
nodeinfo	Fix nodeinfo metadata attribute being an array instead of an object (#20114)	2022-11-08 17:26:11 +01:00
rest	Merge remote-tracking branch 'upstream/main' into develop	2022-11-10 21:11:05 +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	Add maskable icon support for Android (#20904)	2022-11-17 10:52:30 +01: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