Claire c04f2d0cf7 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/settings/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc had a different lambda due to its theming system. Applied the same code style changes. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc removed some code just after the lambda. Applied the same code style changes.		2023-07-17 19:02:23 +02:00
..
statuses
_filter.html.haml
_filter_fields.html.haml	Fix haml-lint Rubocop lambda cop (#25946)	2023-07-17 15:07:29 +02:00
_keyword_fields.html.haml
edit.html.haml
index.html.haml
new.html.haml