abfdafef1e
Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did. |
||
---|---|---|
.. | ||
build-image.yml | ||
check-i18n.yml | ||
codeql.yml | ||
haml-lint-problem-matcher.json | ||
lint-css.yml | ||
lint-haml.yml | ||
lint-js.yml | ||
lint-json.yml | ||
lint-md.yml | ||
lint-ruby.yml | ||
lint-yml.yml | ||
rebase-needed.yml | ||
test-js.yml | ||
test-migrations-one-step.yml | ||
test-migrations-two-step.yml | ||
test-ruby.yml |