summaryrefslogtreecommitdiffstats
path: root/web/react/package.json
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-10-26 22:11:42 -0700
committer=Corey Hulen <corey@hulen.com>2015-10-26 22:11:42 -0700
commitaec99ceb9d47d6354ac5a96bbc290126b55d30f5 (patch)
treeecb72b0d51f6edc7341ac5bef0a4f61583f81dde /web/react/package.json
parente750a8fd361ef6dfce557530a10aaf5ce5a7f37e (diff)
parent28847c6b4b864d747bbfdf5c53354dcb24e5f895 (diff)
downloadchat-aec99ceb9d47d6354ac5a96bbc290126b55d30f5.tar.gz
chat-aec99ceb9d47d6354ac5a96bbc290126b55d30f5.tar.bz2
chat-aec99ceb9d47d6354ac5a96bbc290126b55d30f5.zip
Merge branch 'master' into PLT-25
Diffstat (limited to 'web/react/package.json')
-rw-r--r--web/react/package.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/web/react/package.json b/web/react/package.json
index e6a662375..9af6f5880 100644
--- a/web/react/package.json
+++ b/web/react/package.json
@@ -6,6 +6,7 @@
"autolinker": "0.18.1",
"babel-runtime": "5.8.24",
"flux": "2.1.1",
+ "highlight.js": "^8.9.1",
"keymirror": "0.1.1",
"marked": "0.3.5",
"object-assign": "3.0.0",