Claire 7452a95998 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.		2023-02-19 10:42:55 +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 branch 'main' into glitch-soc/merge-upstream	2023-02-19 10:42:55 +01:00
web	Fix web push notifications containing HTML entities (#18071)	2022-04-23 21:47:43 +02:00
initial_state_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-19 10:42:55 +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