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
..
ISSUE_TEMPLATE	Correct prettier calls for YML/JSON (#21832)	2 years ago
workflows	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
FUNDING.yml	Remove references to discourse.joinmastodon.org (#17797)	3 years ago
stale.yml	Change stale bot to only touch pull requests over 120 days old (#12217)	5 years ago
stylelint-matcher.json	Set-up Problem Matchers (#18598)	2 years ago