Merge remote-tracking branch 'refs/remotes/origin/master' into no-tag-ls
# Conflicts: # package.json
This commit is contained in:
commit
0ecd0dc1a1
1 changed files with 6 additions and 6 deletions
12
package.json
12
package.json
|
@ -66,9 +66,9 @@
|
|||
"@types/websocket": "0.0.33",
|
||||
"autwh": "0.0.1",
|
||||
"babel-core": "6.23.1",
|
||||
"babel-polyfill": "6.22.0",
|
||||
"babel-polyfill": "6.23.0",
|
||||
"babel-preset-es2015": "6.22.0",
|
||||
"babel-preset-stage-3": "6.17.0",
|
||||
"babel-preset-stage-3": "6.22.0",
|
||||
"bcryptjs": "2.4.3",
|
||||
"body-parser": "1.16.1",
|
||||
"chai": "3.5.0",
|
||||
|
@ -76,7 +76,7 @@
|
|||
"chalk": "1.1.3",
|
||||
"compression": "1.6.2",
|
||||
"cors": "2.8.1",
|
||||
"cropperjs": "1.0.0-beta",
|
||||
"cropperjs": "1.0.0-beta.1",
|
||||
"crypto": "0.0.3",
|
||||
"css-loader": "0.26.1",
|
||||
"debug": "2.6.1",
|
||||
|
@ -106,7 +106,7 @@
|
|||
"inquirer": "3.0.1",
|
||||
"is-root": "1.0.0",
|
||||
"is-url": "1.2.2",
|
||||
"js-yaml": "3.8.0",
|
||||
"js-yaml": "3.8.1",
|
||||
"mime-types": "2.1.14",
|
||||
"mocha": "3.2.0",
|
||||
"mongodb": "2.2.24",
|
||||
|
@ -118,7 +118,7 @@
|
|||
"nyaize": "0.0.2",
|
||||
"page": "1.7.1",
|
||||
"prominence": "0.2.0",
|
||||
"pug": "2.0.0-beta9",
|
||||
"pug": "2.0.0-beta11",
|
||||
"ratelimiter": "2.2.0",
|
||||
"recaptcha-promise": "0.1.2",
|
||||
"reconnecting-websocket": "3.0.3",
|
||||
|
@ -143,7 +143,7 @@
|
|||
"tslint": "4.4.2",
|
||||
"typescript": "2.1.6",
|
||||
"uuid": "3.0.1",
|
||||
"velocity-animate": "1.4.2",
|
||||
"velocity-animate": "1.4.3",
|
||||
"vhost": "3.0.2",
|
||||
"vinyl-named": "1.1.0",
|
||||
"webpack": "2.2.1",
|
||||
|
|
Loading…
Reference in a new issue