Merge branch 'master' of github.com:Eugeny/terminus

This commit is contained in:
Eugene Pankov
2019-09-09 16:23:51 +02:00
12 changed files with 81 additions and 72 deletions

View File

@@ -4,7 +4,7 @@
"@types/electron-config": "^3.2.2",
"@types/electron-debug": "^2.1.0",
"@types/js-yaml": "^3.12.1",
"@types/node": "^12.7.3",
"@types/node": "^12.7.4",
"@types/webpack-env": "1.13.9",
"@typescript-eslint/eslint-plugin": "^2.1.0",
"@typescript-eslint/parser": "^2.1.0",
@@ -37,8 +37,8 @@
"raw-loader": "3.1.0",
"sass-loader": "^8.0.0",
"shelljs": "0.8.3",
"source-code-pro": "^2.30.1",
"source-sans-pro": "2.45.0",
"source-code-pro": "^2.30.2",
"source-sans-pro": "3.6.0",
"style-loader": "^1.0.0",
"svg-inline-loader": "^0.8.0",
"to-string-loader": "1.1.5",
@@ -48,7 +48,7 @@
"url-loader": "^2.1.0",
"val-loader": "1.1.1",
"webpack": "^4.39.3",
"webpack-cli": "^3.3.6",
"webpack-cli": "^3.3.8",
"yaml-loader": "0.5.0"
},
"resolutions": {