diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-27 11:52:13 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-27 11:52:13 -0700 |
| commit | a133f82421d2c67ef32b0aae69a6646a14f97dfc (patch) | |
| tree | 35fe7dcf6b208437111c5d3a843eabf2f4703101 /web/react/components/user_settings/user_settings_general.jsx | |
| parent | e22b9f53034280cd3b730c03520469dca4046484 (diff) | |
| parent | e0f69060fa462390779dd7b4cf6b67a12c3974ba (diff) | |
| download | chat-a133f82421d2c67ef32b0aae69a6646a14f97dfc.tar.gz chat-a133f82421d2c67ef32b0aae69a6646a14f97dfc.tar.bz2 chat-a133f82421d2c67ef32b0aae69a6646a14f97dfc.zip | |
Merge branch 'master' into PLT-340
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) ); |