diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-09-30 19:30:45 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-09-30 19:30:45 +0500 |
| commit | 296b93076888c9b26329938bd1cf1587397c7f51 (patch) | |
| tree | a37a396752971c88e13fc97d88531357ca09542e /web/react/components/admin_console/email_settings.jsx | |
| parent | fb285d7b32a6c5e559277bcb32b3b7ff6889af22 (diff) | |
| parent | 13ebb5fe94bfee4e529f634f02d285fa7d8c0dfc (diff) | |
| download | chat-296b93076888c9b26329938bd1cf1587397c7f51.tar.gz chat-296b93076888c9b26329938bd1cf1587397c7f51.tar.bz2 chat-296b93076888c9b26329938bd1cf1587397c7f51.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into plt-383
Diffstat (limited to 'web/react/components/admin_console/email_settings.jsx')
| -rw-r--r-- | web/react/components/admin_console/email_settings.jsx | 4 |
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 |