summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-09-16 09:29:50 -0700
committer=Corey Hulen <corey@hulen.com>2015-09-16 09:29:50 -0700
commit84c0b96e0b89e54d02c5bc0a10f383fa8559809b (patch)
tree6fcb00e45af0e76f08b93d15937a6ff7077703ca /web/react
parent2fc01df828b7fe40bd17d13b78b2f8b6922bb1bb (diff)
parentd4887cef03e3321910d33d672c194d1966cd0aac (diff)
downloadchat-84c0b96e0b89e54d02c5bc0a10f383fa8559809b.tar.gz
chat-84c0b96e0b89e54d02c5bc0a10f383fa8559809b.tar.bz2
chat-84c0b96e0b89e54d02c5bc0a10f383fa8559809b.zip
Merge branch 'master' into PLT-93
Diffstat (limited to 'web/react')
-rw-r--r--web/react/package.json7
1 files changed, 4 insertions, 3 deletions
diff --git a/web/react/package.json b/web/react/package.json
index 11d60376d..04e0f6bab 100644
--- a/web/react/package.json
+++ b/web/react/package.json
@@ -8,7 +8,8 @@
"keymirror": "0.1.1",
"object-assign": "3.0.0",
"react-zeroclipboard-mixin": "0.1.0",
- "twemoji": "1.4.1"
+ "twemoji": "1.4.1",
+ "babel-runtime": "5.8.24"
},
"devDependencies": {
"browserify": "11.0.1",
@@ -26,8 +27,8 @@
},
"browserify": {
"transform": [
- "babelify",
- "envify"
+ ["babelify", { "optional": ["runtime"] }],
+ "envify"
]
},
"jest": {