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

Conflicts:
- config/locales/pl.yml
  Conflict caused by new upstream string too close to glitch-specific
  “flavour” string. Took both strings.

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

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

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

diff --cc app/helpers/stream_entries_helper.rb
Simple merge

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

diff --cc app/javascript/mastodon/locales/en.json
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/components.scss
Simple merge

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

diff --cc app/presenters/instance_presenter.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,f3da82b1c9458b32c335f9bb5e49046843f6c075..e67a55edb286455af3433ff5e5b2a22fd4bb74ef
--- 1/config/locales/pl.yml
--- 2/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@@ -612,10 -644,11 +644,12 @@@ pl
      more: Więcej…
      resources: Zasoby
    generic:
+     all: Wszystkie
      changes_saved_msg: Ustawienia zapisane!
      copy: Kopiuj
+     order_by: Uporządkuj według
      save_changes: Zapisz zmiany
 +    use_this: Użyj tego
      validation_errors:
        few: Coś jest wciąż nie tak! Przejrzyj %{count} poniższe błędy
        many: Coś jest wciąż nie tak! Przejrzyj %{count} poniższych błędów
@@@ -818,7 -884,7 +885,8 @@@
      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

diff --cc config/navigation.rb
Simple merge

diff --cc config/routes.rb
Simple merge