Merge branch 'master' into pb-remove-unneeded-files-win

This commit is contained in:
Ian Olsen
2017-08-15 16:12:15 -07:00
16 changed files with 811 additions and 309 deletions

View File

@@ -875,10 +875,6 @@
"hasDeprecations": true,
"latestHasDeprecations": false
},
"language-typescript": {
"hasAlternative": true,
"alternative": "atom-typescript"
},
"laravel-facades": {
"version": "<=1.0.0",
"hasDeprecations": true,

View File

@@ -9,7 +9,7 @@
"csslint": "1.0.2",
"donna": "1.0.16",
"electron-chromedriver": "~1.6",
"electron-link": "0.1.0",
"electron-link": "0.1.1",
"electron-mksnapshot": "~1.6",
"electron-packager": "7.3.0",
"electron-winstaller": "2.6.2",