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

Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/directories_controller.rb
Simple merge

diff --cc app/javascript/mastodon/locales/ja.json
Simple merge

diff --cc app/javascript/mastodon/locales/pl.json
Simple merge

diff --cc app/javascript/styles/mastodon/admin.scss
Simple merge

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

diff --cc app/models/account.rb
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc config/locales/ja.yml
Simple merge

diff --cc config/locales/pl.yml
index 9470e875a9753fc4062fb186b0095ba5e2b43647,9a8a1d7780e15ec69d9f449e3c35e032493a0016..bacb457bfe67e72bb550860834163b326741c821
--- 1/config/locales/pl.yml
--- 2/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@@ -818,7 -872,7 +873,8 @@@ pl
      edit_profile: Edytuj profil
      export: Eksportowanie danych
      featured_tags: Wyróżnione hashtagi
 +    flavours: Odmiany
+     identity_proofs: Dowody tożsamości
      import: Importowanie danych
      migrate: Migracja konta
      notifications: Powiadomienia