summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-02-23 08:24:42 -0500
committerChristopher Speller <crspeller@gmail.com>2016-02-23 08:24:42 -0500
commit3f3718a007fb824bbb50199813fdaa83ad17c7eb (patch)
tree3a806172b28ece33a5826b9d09a8faf99ae907cc /web/react/components/user_settings
parentf8959b78bdd5ee06ed5d3250683d0950ab21c12d (diff)
parent2b852fb9c586c20a45b74a6e91230234d2321ba1 (diff)
downloadchat-3f3718a007fb824bbb50199813fdaa83ad17c7eb.tar.gz
chat-3f3718a007fb824bbb50199813fdaa83ad17c7eb.tar.bz2
chat-3f3718a007fb824bbb50199813fdaa83ad17c7eb.zip
Merge pull request #2223 from ZBoxApp/fix-locs
Fix for PLT-1945, PLT-2012, PLT-2045 & PLT-2067
Diffstat (limited to 'web/react/components/user_settings')
-rw-r--r--web/react/components/user_settings/user_settings_general.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx
index cd229775f..2f2116c2a 100644
--- a/web/react/components/user_settings/user_settings_general.jsx
+++ b/web/react/components/user_settings/user_settings_general.jsx
@@ -22,7 +22,7 @@ const holders = defineMessages({
},
usernameRestrictions: {
id: 'user.settings.general.usernameRestrictions',
- defaultMessage: "'Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-' and '_'."
+ defaultMessage: "Username must begin with a letter, and contain between {min} to {max} lowercase characters made up of numbers, letters, and the symbols '.', '-' and '_'."
},
validEmail: {
id: 'user.settings.general.validEmail',