Claire ab59743c13 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.

2023-01-14 22:34:09 +01:00

..

_account.html.haml

Change number_to_human calls to always use 3-digits precision (#16469)

2021-07-07 21:13:08 +02:00

show.html.haml

Merge branch 'main' into glitch-soc/merge-upstream

2023-01-14 22:34:09 +01:00