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.		2023-03-16 23:12:59 +01:00
..
two_factor	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
new.html.haml	Fix more haml-lint Rubocop (#24107)	2023-03-15 20:07:43 +01:00
two_factor.html.haml	Setup haml-lint CI with todo config (#23524)	2023-03-15 04:15:36 +01:00