From: Thibaut Girka <thib@sitedethib.com>
Date: Thu, 8 Aug 2019 06:44:33 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ebc0521ba82cfc43094a1aead868c61118767030;p=mastodon.git

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

ebc0521ba82cfc43094a1aead868c61118767030
diff --cc config/locales/en.yml
index 6b6b99683,7fd0536ae..5fc166f4c
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -259,8 -259,9 +259,10 @@@ en
        feature_timeline_preview: Timeline preview
        features: Features
        hidden_service: Federation with hidden services
 +      keybase: Keybase integration
        open_reports: open reports
+       pending_tags: hashtags waiting for review
+       pending_users: users waiting for review
        recent_users: Recent users
        search: Full-text search
        single_user_mode: Single user mode