Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property		2022-06-28 11:11:18 +02:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-28 16:22:28 +02:00
nodeinfo	Add “services” and “metadata” to NodeInfo (#18563)	2022-06-01 16:24:07 +02:00
rest	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-28 11:11:18 +02: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	2022-05-16 22:29:05 +02:00
manifest_serializer.rb	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +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