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

Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream fixed an issue that glitch-soc did not have, in a place with
  glitch-soc changes to hide the number of followers.
  Kept glitch-soc's code.
This commit is contained in:
Claire
2022-03-17 19:23:39 +01:00
89 changed files with 5449 additions and 5059 deletions

View File

@ -9,9 +9,9 @@ module ApplicationHelper
RTL_LOCALES = %i(
ar
ckb
fa
he
ku
).freeze
def friendly_number_to_human(number, **options)