Claire 2b0410f903 Merge commit 'f7aab0cc2ff47337021d50ed52428abcb7a9b518' into glitch-soc/backports-4.3 ... Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper, while glitch-soc had extra helpers. Added upstream's helper.		2024-10-18 17:19:57 +02:00
..
mailer	Merge commit 'f7aab0cc2ff47337021d50ed52428abcb7a9b518' into glitch-soc/backports-4.3	2024-10-18 17:19:57 +02:00
_card.html.haml	Migrate fontawesome->material in more views (#31360)	2024-08-20 11:52:45 +00:00
_flashes.html.haml	Added haml-lint and fix warnings (#2773)	2017-05-08 03:35:25 +02:00