Claire 0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/content_security_policy.rb`: Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS` environment variable. Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.		2024-01-10 17:51:12 +01:00
..
activitypub	Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream	2023-12-20 22:05:31 +01:00
node_info	nodeinfo: add instance name and description (#28079)	2023-11-28 00:51:22 +00:00
rest	Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream	2024-01-10 17:51:12 +01:00
web	…
initial_state_serializer.rb	Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream	2023-12-21 19:24:10 +01:00
manifest_serializer.rb	Change PWA start URL from `/home` to `/` (#27377)	2023-10-12 16:47:18 +02:00
oembed_serializer.rb	…
webfinger_serializer.rb	…