natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	package.json
This commit is contained in:
syuilo 2017-01-18 14:20:38 +09:00
parent 1cd99290db 2385f4e65d
commit 0e9e5327ed
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -29,7 +29,7 @@
"@types/chalk": "0.4.31",
"@types/compression": "0.0.33",
"@types/cors": "2.8.0",
"@types/elasticsearch": "5.0.10",
"@types/elasticsearch": "5.0.12",
"@types/escape-html": "0.0.19",
"@types/event-stream": "3.3.30",
"@types/express": "4.0.34",
@ -67,7 +67,7 @@
"babel-preset-es2015": "6.18.0",
"babel-preset-stage-3": "6.17.0",
"bcryptjs": "2.4.0",
"body-parser": "1.15.2",
"body-parser": "1.16.0",
"browserify": "13.3.0",
"browserify-livescript": "0.2.3",
"chai": "3.5.0",