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 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them.		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	Add maskable icon support for Android (#20904)	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