diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-10-27 20:15:33 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-10-27 20:15:33 +0500 |
| commit | 179c4ea684af8d2a021cc6f0042bc4408f39b0bb (patch) | |
| tree | 7789805249e5c962f1175f301beb74272dee30c0 /web/react/components/user_settings/user_settings_general.jsx | |
| parent | 68b02ffb9eeb7a414feae8ed89b4011ccecf96bc (diff) | |
| parent | 50eb3d9fe46d6364b6f12201edfe0a401be3ccdd (diff) | |
| download | chat-179c4ea684af8d2a021cc6f0042bc4408f39b0bb.tar.gz chat-179c4ea684af8d2a021cc6f0042bc4408f39b0bb.tar.bz2 chat-179c4ea684af8d2a021cc6f0042bc4408f39b0bb.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
Diffstat (limited to 'web/react/components/user_settings/user_settings_general.jsx')
| -rw-r--r-- | web/react/components/user_settings/user_settings_general.jsx | 2 |
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 70e559c30..1c8ce3c79 100644 --- a/web/react/components/user_settings/user_settings_general.jsx +++ b/web/react/components/user_settings/user_settings_general.jsx @@ -171,7 +171,7 @@ export default class UserSettingsGeneralTab extends React.Component { }.bind(this), function imageUploadFailure(err) { var state = this.setupInitialState(this.props); - state.serverError = err; + state.serverError = err.message; this.setState(state); }.bind(this) ); |