Merge from master

This commit is contained in:
Raj Musuku
2019-02-21 17:56:04 -08:00
parent 5a146e34fa
commit 666ae11639
11482 changed files with 119352 additions and 255574 deletions

View File

@@ -17,7 +17,7 @@ set CODE=".build\electron\%NAMESHORT%"
node build\lib\electron.js
if %errorlevel% neq 0 node .\node_modules\gulp\bin\gulp.js electron
:: Manage build-in extensions
:: Manage built-in extensions
if "%1"=="--builtin" goto builtin
:: Sync built-in extensions
@@ -49,4 +49,4 @@ goto end
popd
endlocal
endlocal