Claire 395b9011ee Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, just upstream adding a method textually adjacent to glitch-soc only code. Ported upstream's change.		2024-06-17 18:30:28 +02:00
..
_custom_emoji.html.haml	Fix haml-lint UnnecessaryStringOutput for views (#27531)	2023-10-25 12:01:00 +00:00
index.html.haml	Convert form_for -> form_with in views (#30700)	2024-06-14 09:54:22 +00:00
new.html.haml	Merge commit 'f445d33fd6aa492df319f4cc4efbd255d7a84f0e' into glitch-soc/merge-upstream	2024-03-15 12:43:59 +01:00