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 193250556c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.		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