Merge remote-tracking branch 'tootsuite/master' into merge-upstream

Conflicts: app/javascript/styles/mastodon/components.scss
2018-02-02 08:39:52 -06:00
parent ad3a2dfb66 33f56811e3
commit 4c1fd9a19c
30 changed files with 244 additions and 95 deletions
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@ -54,6 +54,7 @@ en:
        severity: Severity
        type: Import type
        username: Username
+        username_or_email: Username or Email
      interactions:
        must_be_follower: Block notifications from non-followers
        must_be_following: Block notifications from people you don't follow