Claire 2d4ff8f6ed Merge commit 'f445d33fd6aa492df319f4cc4efbd255d7a84f0e' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Upstream split some `simple_form` arguments across multiple lines. One of the arguments in glitch-soc was different. Split as upstream's did, keeping our different limit argument. - `app/views/admin/settings/appearance/show.html.haml`: Upstream split some `simple_form` arguments across multiple lines. Glitch-soc had a different field because of the different theming system. Kept glitch-soc's definition of that form field.		2024-03-15 12:43:59 +01:00
..
about	Fix haml-lint LineLength cops in app/views/admin (#28680)	2024-03-15 11:19:00 +00:00
appearance	Merge commit 'f445d33fd6aa492df319f4cc4efbd255d7a84f0e' into glitch-soc/merge-upstream	2024-03-15 12:43:59 +01:00
branding	Fix haml-lint LineLength cops in app/views/admin (#28680)	2024-03-15 11:19:00 +00:00
content_retention	Fix haml-lint LineLength cops in app/views/admin (#28680)	2024-03-15 11:19:00 +00:00
discovery	Merge commit 'f445d33fd6aa492df319f4cc4efbd255d7a84f0e' into glitch-soc/merge-upstream	2024-03-15 12:43:59 +01:00
other	Add back missing glitch-soc admin settings (#1919)	2022-11-12 13:24:53 +01:00
registrations	Fix haml-lint LineLength cops in app/views/admin (#28680)	2024-03-15 11:19:00 +00:00
shared	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-19 07:35:51 +02:00