Merge branch 'master' into ben/associations

This commit is contained in:
Benjamin Pasero
2016-03-04 17:40:04 +01:00
12 changed files with 72 additions and 209 deletions

View File

@@ -13,10 +13,6 @@
"vscode-languageserver": "^1.3.0",
"vscode-nls": "^1.0.4"
},
"devDependencies": {
"mocha": "^2.2.5",
"typescript": "^1.6.2"
},
"scripts": {
"compile": "gulp compile-extension:json-server",
"watch": "gulp watch-extension:json-server"