diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-27 19:48:41 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-27 19:48:41 +0000 |
| commit | ea50f55148f059549a586fb136eaa62963e33e66 (patch) | |
| tree | c8178a76a0f7a5cf4817abeae8ab263375683e6d /src/i18n | |
| parent | 72749834f3c82847dd8b584cb0e0622a25f292f8 (diff) | |
| parent | 3870adf51ff736617f48619d16553010d5e9c9b0 (diff) | |
Merge branch 'develop' into 'masto-api/direct'
# Conflicts:
# src/services/api/api.service.js
Diffstat (limited to 'src/i18n')
| -rw-r--r-- | src/i18n/en.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/i18n/en.json b/src/i18n/en.json index ecf9628f..c501c6a7 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -98,7 +98,7 @@ "new_captcha": "Click the image to get a new captcha", "username_placeholder": "e.g. lain", "fullname_placeholder": "e.g. Lain Iwakura", - "bio_placeholder": "e.g.\nHi, I'm Lain\nI’m an anime girl living in suburban Japan. You may know me from the Wired.", + "bio_placeholder": "e.g.\nHi, I'm Lain.\nI’m an anime girl living in suburban Japan. You may know me from the Wired.", "validations": { "username_required": "cannot be left blank", "fullname_required": "cannot be left blank", |