Merge remote-tracking branch 'refs/remotes/origin/master' into test

# Conflicts:
#	package.json
This commit is contained in:
syuilo 2017-02-08 16:49:11 +09:00
commit 49ea411524

View File

@ -17,6 +17,9 @@
"@types/debug": "0.0.29",
"@types/express": "4.0.35",
"@types/mocha": "2.2.39",
"@types/event-stream": "3.3.30",
"@types/gulp": "3.8.32",
"@types/gulp-typescript": "0.0.32",
"@types/node": "7.0.5",
"@types/request": "0.0.39",
"chai": "3.5.0",