summaryrefslogtreecommitdiffstats
path: root/web/react/package.json
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-03-14 00:56:37 -0400
committerChristopher Speller <crspeller@gmail.com>2016-03-14 00:56:37 -0400
commit975159b52ac6bf0ee6b2d5b73d2391b2e0c6e165 (patch)
treea0852f9faf6de9962b5478ed3f1bbaccd71062c0 /web/react/package.json
parent160e1a8bea6d8280ef3b41a4a9f80674b75f3eb0 (diff)
parentd7cdcf082fab6c0cb7c2fe4bed821bd1a8000e69 (diff)
downloadchat-975159b52ac6bf0ee6b2d5b73d2391b2e0c6e165.tar.gz
chat-975159b52ac6bf0ee6b2d5b73d2391b2e0c6e165.tar.bz2
chat-975159b52ac6bf0ee6b2d5b73d2391b2e0c6e165.zip
Merge pull request #2331 from mattermost/plt-1680
PLT-1680 Converting client to react-router. Stage 1
Diffstat (limited to 'web/react/package.json')
-rw-r--r--web/react/package.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/web/react/package.json b/web/react/package.json
index 07ffa0cdf..509c9967b 100644
--- a/web/react/package.json
+++ b/web/react/package.json
@@ -11,6 +11,8 @@
"marked": "mattermost/marked#cb85e5cc81bc7937dbb73c3c53d9532b1b97e3ca",
"mm-intl": "mattermost/mm-intl#805442fd474fa40cd586ddeda404dbbe8e60626d",
"object-assign": "4.0.1",
+ "react": "0.14.3",
+ "react-router": "2.0.0",
"twemoji": "1.4.1"
},
"devDependencies": {