diff options
| author | Maxim <mail@potapovmax.com> | 2015-10-13 10:15:44 +0300 |
|---|---|---|
| committer | Maxim <mail@potapovmax.com> | 2015-10-13 10:15:44 +0300 |
| commit | 9d3248ccec89e533527bb86e082ef445c3cdfe7d (patch) | |
| tree | fea41f942c66a2ae397ed12f1013585bcbf7775c /web/react/components/user_settings/user_settings_general.jsx | |
| parent | 53d58fc3374268484a6eb5d8aae2c82719ec782d (diff) | |
| parent | 0144b6fd8a95c6b65695b07483a528707dce1cfe (diff) | |
| download | chat-9d3248ccec89e533527bb86e082ef445c3cdfe7d.tar.gz chat-9d3248ccec89e533527bb86e082ef445c3cdfe7d.tar.bz2 chat-9d3248ccec89e533527bb86e082ef445c3cdfe7d.zip | |
Merge branch 'master' into PLT-590
Diffstat (limited to 'web/react/components/user_settings/user_settings_general.jsx')
| -rw-r--r-- | web/react/components/user_settings/user_settings_general.jsx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx index c23c61948..66d83725c 100644 --- a/web/react/components/user_settings/user_settings_general.jsx +++ b/web/react/components/user_settings/user_settings_general.jsx @@ -368,8 +368,7 @@ export default class UserSettingsGeneralTab extends React.Component { const extraInfo = ( <span> - {'Use Nickname for a name you might be called that is different from your first name and user name.'} - {'This is most often used when two or more people have similar sounding names and usernames.'} + {'Use Nickname for a name you might be called that is different from your first name and username. This is most often used when two or more people have similar sounding names and usernames.'} </span> ); |