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 c118918520 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/custom_emoji.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific validation. Applied upstream changes. - `app/models/public_feed.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific parameter documentation. Applied upstream changes.		2 years ago
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
nodeinfo	Fix nodeinfo metadata attribute being an array instead of an object (#20114)	2 years ago
rest	Merge branch 'main' into glitch-soc/merge-upstream	2 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	2 years ago
manifest_serializer.rb	Change floating action button to be a button in header in web UI (#19422)	2 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