Claire 34c9f77b3e Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/mailer.html.haml`: Conflict caused by glitch-soc's theming system. Used glitch-soc's path for the mailer pack.		2024-01-15 21:30:00 +01:00
..
inter.scss	Update new email templates (#28416)	2024-01-15 18:18:59 +00:00
roboto-mono.scss	Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream	2023-07-13 13:49:58 +02:00
roboto.scss	Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream	2023-07-13 13:49:58 +02:00