Claire 1c25f35ddf Merge commit '23c3e0985346406f312b88c659cd9fad63cb6060' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because glitch-soc does not have a theme selector here.		2023-06-10 18:42:29 +02:00
..
aliases	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
applications	Setup haml-lint CI with todo config (#23524)	2023-03-15 04:15:36 +01:00
deletes	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
exports	Change user backups to use expiring URLs for download when possible (#24136)	2023-03-16 22:46:52 +01:00
featured_tags	Fix styling of featured tags in light theme (#23252)	2023-01-25 16:28:29 +01:00
flavours	Fix glitch-soc HAML linting issues (#2166)	2023-04-07 20:55:28 +02:00
imports	Add support for importing lists (#25203)	2023-06-01 14:47:31 +02:00
login_activities	Fix typo in _login_activity.html.haml (#24263)	2023-03-26 10:59:14 +02:00
migration/redirects	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
migrations	Fix style for hashes (#20518)	2022-11-17 11:05:39 +01:00
preferences	Merge commit '23c3e0985346406f312b88c659cd9fad63cb6060' into glitch-soc/merge-upstream	2023-06-10 18:42:29 +02:00
profiles	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
shared	2FA controller cleanup (#2296)	2017-04-22 04:23:17 +02:00
two_factor_authentication	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
two_factor_authentication_methods	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00