Merge branch 'master' into fix-ios-copy

This commit is contained in:
Mendel Konikov
2019-01-24 13:58:22 -05:00
committed by GitHub
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
Online comments are broken. Our open-source commenting platform, Talk, rethinks how moderation, comment display, and conversation function, creating the opportunity for safer, smarter discussions around your work. [Read more about Talk here](https://coralproject.net/talk).
Built with <3 by The Coral Project.
Built with <3 by The Coral Project, a part of [Vox Media](https://www.voxmedia.com/a/go-deeper/about).
## Getting Started
+1 -1
View File
@@ -251,7 +251,7 @@ en:
EMAIL_REQUIRED: 'An email address is required'
EMAIL_VERIFICATION_TOKEN_INVALID: 'Email verification token is invalid.'
INCORRECT_PASSWORD: 'Incorrect Password'
INVALID_ASSET_URL: 'Assert URL is invalid'
INVALID_ASSET_URL: 'Asset URL is invalid'
LOGIN_MAXIMUM_EXCEEDED: 'You have made too many unsuccessful password attempts. Please wait.'
network_error: 'Failed to connect to server. Check your internet connection and try again.'
NO_SPECIAL_CHARACTERS: 'Usernames can contain letters numbers and _ only'