Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements

1 files changed, 5 insertions, 2 deletions

diff --git a/web/react/pages/admin_console.jsx b/web/react/pages/admin_console.jsx
index c89cb4edc..ea9ae06f4 100644
--- a/web/react/pages/admin_console.jsx
+++ b/web/react/pages/admin_console.jsx
@@ -5,9 +5,12 @@ var ErrorBar = require('../components/error_bar.jsx');
 var SelectTeamModal = require('../components/admin_console/select_team_modal.jsx');
 var AdminController = require('../components/admin_console/admin_controller.jsx');
 
-export function setupAdminConsolePage() {
+export function setupAdminConsolePage(props) {
     ReactDOM.render(
-        <AdminController />,
+        <AdminController
+            tab={props.ActiveTab}
+            teamId={props.TeamId}
+        />,
         document.getElementById('admin_controller')
     );