diff options
author | =Corey Hulen <corey@hulen.com> | 2016-02-01 14:44:17 -0800 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2016-02-01 14:44:17 -0800 |
commit | b4ec6900510077253290e361d1a706e5368a45de (patch) | |
tree | 6fc7c131fa7aa5f32e3aba8102416aa23c65963d /web/react/package.json | |
parent | ea71731f838fc010cfc7511c09875184d1b2396b (diff) | |
parent | f28486c4553f7f4bccf7bf69153c2f12699705f9 (diff) | |
download | chat-b4ec6900510077253290e361d1a706e5368a45de.tar.gz chat-b4ec6900510077253290e361d1a706e5368a45de.tar.bz2 chat-b4ec6900510077253290e361d1a706e5368a45de.zip |
Fixing merge
Diffstat (limited to 'web/react/package.json')
-rw-r--r-- | web/react/package.json | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/web/react/package.json b/web/react/package.json index 14b16b4e4..fce3e6555 100644 --- a/web/react/package.json +++ b/web/react/package.json @@ -8,22 +8,23 @@ "highlight.js": "8.9.1", "keymirror": "0.1.1", "marked": "mattermost/marked#cb85e5cc81bc7937dbb73c3c53d9532b1b97e3ca", + "mm-intl": "mattermost/mm-intl#805442fd474fa40cd586ddeda404dbbe8e60626d", "object-assign": "4.0.1", "twemoji": "1.4.1" }, "devDependencies": { - "browserify": "12.0.1", - "babelify": "7.2.0", + "babel-eslint": "4.1.7", + "babel-plugin-transform-runtime": "6.1.4", "babel-preset-es2015": "6.1.18", - "babel-preset-stage-0": "6.1.18", "babel-preset-react": "6.1.18", - "babel-plugin-transform-runtime": "6.1.4", - "uglify-js": "2.6.1", - "watchify": "3.6.1", + "babel-preset-stage-0": "6.1.18", + "babelify": "7.2.0", + "browserify": "12.0.1", "eslint": "1.9.0", "eslint-plugin-react": "3.9.0", "exorcist": "0.4.0", - "babel-eslint": "4.1.5" + "uglify-js": "2.6.1", + "watchify": "3.6.1" }, "scripts": { "check": "", |