summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings.jsx
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-09-09 10:56:48 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-09-09 10:56:48 +0500
commitc7692a800ef43b63866b6f470b72eb1c3816484f (patch)
tree801314957491080f83789335f64fb979292529d9 /web/react/components/user_settings.jsx
parent8c9c6de97041f8b2d646a7b4f03852c74e8e8fab (diff)
parent64d4890a4109618b383f7cfe1acc541bd72a0899 (diff)
downloadchat-c7692a800ef43b63866b6f470b72eb1c3816484f.tar.gz
chat-c7692a800ef43b63866b6f470b72eb1c3816484f.tar.bz2
chat-c7692a800ef43b63866b6f470b72eb1c3816484f.zip
Merge branch 'master' of https://github.com/mattermost/platform into ui-changes
Diffstat (limited to 'web/react/components/user_settings.jsx')
-rw-r--r--web/react/components/user_settings.jsx3
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index 282fb7681..2a607b3e0 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -40,6 +40,7 @@ export default class UserSettings extends React.Component {
user={this.state.user}
activeSection={this.props.activeSection}
updateSection={this.props.updateSection}
+ updateTab={this.props.updateTab}
/>
</div>
);
@@ -86,4 +87,4 @@ UserSettings.propTypes = {
activeSection: React.PropTypes.string,
updateSection: React.PropTypes.func,
updateTab: React.PropTypes.func
-}; \ No newline at end of file
+};