You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 1a853d7caa Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict caused because of minor code style change upstream, while glitch-soc has different code for handling variable maximum chars. Ported the change. - `app/serializers/initial_state_serializer.rb`: Conflict because glitch-soc had two extra attributes where upstream added one. Added upstream's attribute.		3 years ago
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
nodeinfo	Add `openRegistrations` attribute to nodeinfo endpoint (#12058)	5 years ago
rest	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
web	Fix web push notifications containing HTML entities (#18071)	3 years ago
initial_state_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
manifest_serializer.rb	fix: PWA web manifest not changed to new routes (#17921)	3 years ago
oembed_serializer.rb	Improve RSS entries for statuses (#13592)	5 years ago
webfinger_serializer.rb	Remove XML version of Webfinger and remove links to Atom feeds (#11460)	5 years ago