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
..
_account.html.haml	Missed a .to_date (#29390)	2024-02-26 12:42:09 +00:00
show.html.haml	Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream	2024-06-17 18:30:28 +02:00