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

Conflicts:
	app/controllers/accounts_controller.rb
	app/javascript/mastodon/locales/pl.json
	app/views/about/more.html.haml

Conflicts in `accounts_controller.rb` resolved by taking upstream's
version + our `use_pack`.

Conflicts in `pl.json` resolved by taking upstream's changes.

Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.

config/locales/pt-BR.yml

@@ -9,9 +9,6 @@ pt-BR:
     contact: Contato
     contact_missing: Não definido
     contact_unavailable: N/A
-    description_headline: O que é %{domain}?
-    domain_count_after: outras instâncias
-    domain_count_before: Conectado a
     extended_description_html: |
       <h3>Um bom lugar para regras</h3>
       <p>A descrição da instância ainda não foi feita.</p>