summaryrefslogtreecommitdiffstats
path: root/webapp/utils
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-06-22 10:30:01 -0400
committerGitHub <noreply@github.com>2016-06-22 10:30:01 -0400
commit14510ce19470c176a7f286d4a3238e813f7dc959 (patch)
tree3aeb058bd9fc0395a040785c876a2762e523df96 /webapp/utils
parent00dc8e734c5af9e2a7de778b60a2eeaa0e1be269 (diff)
downloadchat-14510ce19470c176a7f286d4a3238e813f7dc959.tar.gz
chat-14510ce19470c176a7f286d4a3238e813f7dc959.tar.bz2
chat-14510ce19470c176a7f286d4a3238e813f7dc959.zip
Adding webpack code splitting (#3377)
Diffstat (limited to 'webapp/utils')
-rw-r--r--webapp/utils/text_formatting.jsx2
-rw-r--r--webapp/utils/utils.jsx2
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/utils/text_formatting.jsx b/webapp/utils/text_formatting.jsx
index cc4a24d19..dbf18d722 100644
--- a/webapp/utils/text_formatting.jsx
+++ b/webapp/utils/text_formatting.jsx
@@ -2,7 +2,7 @@
// See License.txt for license information.
import Autolinker from 'autolinker';
-import {browserHistory} from 'react-router';
+import {browserHistory} from 'react-router/es6';
import Constants from './constants.jsx';
import * as Emoticons from './emoticons.jsx';
import * as Markdown from './markdown.jsx';
diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx
index 003f6025d..88d7616de 100644
--- a/webapp/utils/utils.jsx
+++ b/webapp/utils/utils.jsx
@@ -13,7 +13,7 @@ var ActionTypes = Constants.ActionTypes;
import * as AsyncClient from './async_client.jsx';
import Client from './web_client.jsx';
-import {browserHistory} from 'react-router';
+import {browserHistory} from 'react-router/es6';
import icon50 from 'images/icon50x50.png';
import bing from 'images/bing.mp3';