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 0845bee8d6 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream renamed some helper functions that were used in a part of the settings page which glitch-soc slightly changed the layout of. Ported the change.		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
rss	Improve RSS entries for statuses (#13592)	5 years ago
web	Only display web push notifications after API call (fixes #7902) (#8396)	6 years ago
initial_state_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
manifest_serializer.rb	use relative path for `scope` (#16714)	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