From: Thibaut Girka <thib@sitedethib.com>
Date: Tue, 26 Mar 2019 15:02:54 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b9f314bba754074c7ac7dad37cdd35a0cbf1d1b5;p=mastodon.git

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

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

b9f314bba754074c7ac7dad37cdd35a0cbf1d1b5
diff --cc config/locales/pl.yml
index 9470e875a,9a8a1d778..bacb457bf
--- a/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