Merge remote-tracking branch 'upstream/master' into PLT-637

Conflicts:
	web/react/utils/constants.jsx

1 files changed, 3 insertions, 3 deletions

diff --git a/web/react/pages/admin_console.jsx b/web/react/pages/admin_console.jsx
index 7e7dcfae8..c89cb4edc 100644
--- a/web/react/pages/admin_console.jsx
+++ b/web/react/pages/admin_console.jsx
@@ -6,17 +6,17 @@ var SelectTeamModal = require('../components/admin_console/select_team_modal.jsx
 var AdminController = require('../components/admin_console/admin_controller.jsx');
 
 export function setupAdminConsolePage() {
-    React.render(
+    ReactDOM.render(
         <AdminController />,
         document.getElementById('admin_controller')
     );
 
-    React.render(
+    ReactDOM.render(
         <SelectTeamModal />,
         document.getElementById('select_team_modal')
     );
 
-    React.render(
+    ReactDOM.render(
         <ErrorBar/>,
         document.getElementById('error_bar')
     );