Merge branch 'master' into PLT-2115

1 files changed, 0 insertions, 47 deletions

diff --git a/web/react/components/password_reset.jsx b/web/react/components/password_reset.jsx
deleted file mode 100644
index 4c9bb6310..000000000
--- a/web/react/components/password_reset.jsx
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-import PasswordResetSendLink from './password_reset_send_link.jsx';
-import PasswordResetForm from './password_reset_form.jsx';
-
-export default class PasswordReset extends React.Component {
-    constructor(props) {
-        super(props);
-
-        this.state = {};
-    }
-    render() {
-        if (this.props.isReset === 'false') {
-            return (
-                <PasswordResetSendLink
-                    teamDisplayName={this.props.teamDisplayName}
-                    teamName={this.props.teamName}
-                />
-            );
-        }
-
-        return (
-            <PasswordResetForm
-                teamDisplayName={this.props.teamDisplayName}
-                teamName={this.props.teamName}
-                hash={this.props.hash}
-                data={this.props.data}
-            />
-        );
-    }
-}
-
-PasswordReset.defaultProps = {
-    isReset: '',
-    teamName: '',
-    teamDisplayName: '',
-    hash: '',
-    data: ''
-};
-PasswordReset.propTypes = {
-    isReset: React.PropTypes.string,
-    teamName: React.PropTypes.string,
-    teamDisplayName: React.PropTypes.string,
-    hash: React.PropTypes.string,
-    data: React.PropTypes.string
-};