Claire 322e907e04 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream renamed some helper functions that were used in a part of the
  settings page which glitch-soc slightly changed the layout of.
  Ported the change.

2022-02-09 17:28:33 +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

2022-02-09 17:28:33 +01:00