summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-03-17 12:05:17 -0400
committerChristopher Speller <crspeller@gmail.com>2016-03-17 12:05:17 -0400
commit2cd006474ec8a808b2ea2b0502a842f44cb0b127 (patch)
tree32b65030f082b562499bdd2856a510b931266a5e /webapp/components/user_settings
parenta6a9dd76914b33d292a54d667ce6789c2b6b4b41 (diff)
parent93101331bfe146b14fb02e7f57f1e334734878b4 (diff)
downloadchat-2cd006474ec8a808b2ea2b0502a842f44cb0b127.tar.gz
chat-2cd006474ec8a808b2ea2b0502a842f44cb0b127.tar.bz2
chat-2cd006474ec8a808b2ea2b0502a842f44cb0b127.zip
Merge pull request #2461 from hmhealey/teamdefault
Changed 'show username' display text to be more accurate
Diffstat (limited to 'webapp/components/user_settings')
-rw-r--r--webapp/components/user_settings/user_settings_display.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/user_settings/user_settings_display.jsx b/webapp/components/user_settings/user_settings_display.jsx
index 58d4493cb..3299588f7 100644
--- a/webapp/components/user_settings/user_settings_display.jsx
+++ b/webapp/components/user_settings/user_settings_display.jsx
@@ -195,7 +195,7 @@ export default class UserSettingsDisplay extends React.Component {
const showUsername = (
<FormattedMessage
id='user.settings.display.showUsername'
- defaultMessage='Show username (team default)'
+ defaultMessage='Show username (default)'
/>
);
const showNickname = (