You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 43a0d704fb Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/mailer.html.haml`: Upstream removed a line close to one modified by glitch-soc. Removed the line as upstream did.		2 years ago
..
_account.html.haml	Change number_to_human calls to always use 3-digits precision (#16469)	3 years ago
show.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago