Claire 656a41db2a Merge commit '77098c6f1c' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated its README, we have a completely different one. Kept ours. - `app/views/auth/sessions/two_factor.html.haml`: Upstream refactored stuff and the conflict is because of glitch-soc's theming system. Ported upstream changes while accounting for the different theming system.		2023-10-17 20:59:18 +02:00
..
_account.html.haml	Fix haml-lint InstanceVariables rule for relationships/account (#27342)	2023-10-11 17:06:26 +02:00
show.html.haml	Merge commit '77098c6f1c' into glitch-soc/merge-upstream	2023-10-17 20:59:18 +02:00