diff options
| author | Henry Jameson <me@hjkos.com> | 2019-03-27 22:24:38 +0200 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2019-03-27 22:24:38 +0200 |
| commit | 66ab131bd431f955814d0c85e8d9445fc8e46c51 (patch) | |
| tree | 79eeb566c57664b3214dd8088b27b88de6ea693a /src/i18n | |
| parent | c2c7e12aadda0ca78f1b0e3789d19bdb6784d89f (diff) | |
| parent | 4d66b9cf45c3ae2c965347860383767921f5eb55 (diff) | |
Merge remote-tracking branch 'upstream/develop' into mastoapi/actions
* upstream/develop:
errata
review
Revert "Merge branch 'revert-987b5162' into 'develop'"
Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
Add await to login action'
correctly paginate on MastoAPI
#442 - update placeholder linebreak
#442 - clean up Bio placeholder text
wip support for follower/following, a bit broken and with regression
switch direct messages to mastoapi
switch public and TWKN to MastoAPI
undo this change since BE returns empty object for relationship, add in a separate MR
updates normalizer for proper user handling and adds support for friends tl via mastoapi
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", |