summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-09-29 15:00:10 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-09-29 15:00:10 -0400
commitc3d9235878fb86f6aca4ad6b78c7589e3cb15d31 (patch)
treee9aa112ef380aa7683b7ffdb4e646ceada21a977 /web
parente937beb51bc2166e0cb6658d5523aa584d2dd807 (diff)
parent764b4b1d82886a55d30691949b97c60d2d6387a4 (diff)
downloadchat-c3d9235878fb86f6aca4ad6b78c7589e3cb15d31.tar.gz
chat-c3d9235878fb86f6aca4ad6b78c7589e3cb15d31.tar.bz2
chat-c3d9235878fb86f6aca4ad6b78c7589e3cb15d31.zip
Merge pull request #858 from mattermost/PLT-425
PLT-425 changing wording
Diffstat (limited to 'web')
-rw-r--r--web/react/components/admin_console/email_settings.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx
index 3b5ad2a1a..762a4ab26 100644
--- a/web/react/components/admin_console/email_settings.jsx
+++ b/web/react/components/admin_console/email_settings.jsx
@@ -288,7 +288,7 @@ export default class EmailSettings extends React.Component {
className='control-label col-sm-4'
htmlFor='feedbackName'
>
- {'Feedback Name:'}
+ {'Notification Display Name:'}
</label>
<div className='col-sm-8'>
<input
@@ -310,7 +310,7 @@ export default class EmailSettings extends React.Component {
className='control-label col-sm-4'
htmlFor='feedbackEmail'
>
- {'Feedback Email:'}
+ {'Notification Email Address:'}
</label>
<div className='col-sm-8'>
<input