diff options
author | Stas Vovk <stas@vovk.me> | 2015-10-16 14:21:51 +0300 |
---|---|---|
committer | Stas Vovk <stas@vovk.me> | 2015-10-16 14:21:51 +0300 |
commit | 79fcb9808421dd93342a9538d05dd2259f5dd14b (patch) | |
tree | 33a1a865144f280e37fde07a7c91ed8825c53801 /web/react/pages/admin_console.jsx | |
parent | 2bd81ff379acb347534e4d6a1a27624e0262deb0 (diff) | |
parent | 50a8e2bd4fa53c6bb2f12a03237be4fbaf259617 (diff) | |
download | chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.tar.gz chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.tar.bz2 chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.zip |
Merge remote-tracking branch 'upstream/master' into PLT-637
Conflicts:
web/react/utils/constants.jsx
Diffstat (limited to 'web/react/pages/admin_console.jsx')
-rw-r--r-- | web/react/pages/admin_console.jsx | 6 |
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') ); |