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 6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`		2 years ago
..
build-image.yml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
check-i18n.yml	See version file in GitHub Actions (#21927)	2 years ago
codeql.yml	Run Prettier on YML files (#22345)	2 years ago
lint-json.yml	Move Prettier CI checks to filtered jobs (#22376)	2 years ago
lint-yml.yml	Move Prettier CI checks to filtered jobs (#22376)	2 years ago
linter.yml	Move Prettier CI checks to filtered jobs (#22376)	2 years ago
rebase-needed.yml	Add CI job to label PRs with merge conflicts (#22020)	2 years ago