Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master

This commit is contained in:
Eugen Rochko 2017-04-11 20:43:56 +02:00
commit 2a7602cad4
16 changed files with 144 additions and 18 deletions

View file

@ -29,6 +29,7 @@ en:
setting_default_privacy: Post privacy
type: Import type
username: Username
setting_boost_modal: Show confirmation dialog before boosting
interactions:
must_be_follower: Block notifications from non-followers
must_be_following: Block notifications from people you don't follow