diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-01-12 19:59:37 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-01-12 19:59:37 -0500 |
| commit | 8fb66c2b834ee4e0669de173e5ddfebd56c34d58 (patch) | |
| tree | 9e8e66772d44c4f9010a48c8e0afed70421238b1 /webapp/components/admin_console/admin_team_members_dropdown.jsx | |
| parent | 4208e42ba9df02b9c4bd7081179922c21206d83d (diff) | |
| parent | aafb8be87c79c60df7534b3b69f967c6301b157e (diff) | |
| download | chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.tar.gz chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.tar.bz2 chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.zip | |
Merge branch 'release-3.6'
Diffstat (limited to 'webapp/components/admin_console/admin_team_members_dropdown.jsx')
| -rw-r--r-- | webapp/components/admin_console/admin_team_members_dropdown.jsx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/webapp/components/admin_console/admin_team_members_dropdown.jsx b/webapp/components/admin_console/admin_team_members_dropdown.jsx index 0019dfbc0..ee9e53f6c 100644 --- a/webapp/components/admin_console/admin_team_members_dropdown.jsx +++ b/webapp/components/admin_console/admin_team_members_dropdown.jsx @@ -432,10 +432,6 @@ export default class AdminTeamMembersDropdown extends React.Component { ); } - if (global.window.mm_config.EnableSignInWithEmail !== 'true') { - passwordReset = null; - } - let makeDemoteModal = null; if (this.props.user.id === me.id) { const title = ( |