Merge branch 'master' into greenkeeper/debug-2.6.6

2017-04-28 14:58:52 +09:00 · 2017-04-28 14:58:52 +09:00 · e0bf9d6c14
commit e0bf9d6c14
parent 345f8e3dbc d549b8a94d
1 changed files with 2 additions and 2 deletions
--- a/package.json
+++ b/package.json
@ -72,7 +72,7 @@
    "gulp": "3.9.1",
    "gulp-cssnano": "2.1.2",
    "gulp-imagemin": "3.2.0",
-    "gulp-mocha": "4.3.0",
+    "gulp-mocha": "4.3.1",
    "gulp-pug": "3.3.0",
    "gulp-rename": "1.2.2",
    "gulp-replace": "0.5.4",
@ -145,7 +145,7 @@
    "tcp-port-used": "0.1.2",
    "textarea-caret": "3.0.2",
    "ts-node": "3.0.1",
-    "typescript": "2.2.2",
+    "typescript": "2.3.1",
    "uuid": "3.0.1",
    "vhost": "3.0.2",
    "websocket": "1.0.24",