diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-23 12:55:58 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-23 12:55:58 -0700 |
| commit | 2b5b8f95ed9de37a15dc68c38c46a1da2bb1e160 (patch) | |
| tree | d5bf8318dc82d96cd34b83481e1cc5c8289d170a /web/react/package.json | |
| parent | 9e04909c0a3672d27c148c931d82b225cc86dfe5 (diff) | |
| parent | 0170cfe604e6cfb430be0b6181243ca85a9ab27b (diff) | |
| download | chat-2b5b8f95ed9de37a15dc68c38c46a1da2bb1e160.tar.gz chat-2b5b8f95ed9de37a15dc68c38c46a1da2bb1e160.tar.bz2 chat-2b5b8f95ed9de37a15dc68c38c46a1da2bb1e160.zip | |
Merge branch 'master' into PLT-11-email
Diffstat (limited to 'web/react/package.json')
| -rw-r--r-- | web/react/package.json | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/web/react/package.json b/web/react/package.json index dd7d45f8a..a9eba6c6c 100644 --- a/web/react/package.json +++ b/web/react/package.json @@ -4,13 +4,14 @@ "private": true, "dependencies": { "autolinker": "0.18.1", + "babel-runtime": "5.8.24", + "bootstrap-colorpicker": "2.2.0", "flux": "2.1.1", "keymirror": "0.1.1", + "marked": "0.3.5", "object-assign": "3.0.0", "react-zeroclipboard-mixin": "0.1.0", - "twemoji": "1.4.1", - "babel-runtime": "5.8.24", - "marked": "0.3.5" + "twemoji": "1.4.1" }, "devDependencies": { "browserify": "11.0.1", @@ -28,8 +29,15 @@ }, "browserify": { "transform": [ - ["babelify", { "optional": ["runtime"] }], - "envify" + [ + "babelify", + { + "optional": [ + "runtime" + ] + } + ], + "envify" ] }, "jest": { |