diff options
author | nicolas <nclm@users.noreply.github.com> | 2016-11-22 17:26:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-22 17:26:17 +0100 |
commit | f5dd152e1a83cf2fa19e6082343fe57f7a6382b5 (patch) | |
tree | 126afef7b3418a1b09335bccc3a6c36991b7a86e /config/locales/simple_form.en.yml | |
parent | c7031fd535249e3140bc780ca98f099496ccd959 (diff) | |
parent | 95db6cbe28acc193ff0c898790a6740c4ff3d473 (diff) |
Merge pull request #2 from Gargron/master
Merge
Diffstat (limited to 'config/locales/simple_form.en.yml')
-rw-r--r-- | config/locales/simple_form.en.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 5b66fccd5..a7d958c06 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -14,8 +14,8 @@ en: new_password: New password note: Bio password: Password - username: Username silenced: Unlisted mode + username: Username notification_emails: favourite: Send e-mail when someone favourites your status follow: Send e-mail when someone follows you |