Merge branch 'master' into greenkeeper/bootstrap-4.2.1

This commit is contained in:
ziajka 2018-12-28 11:33:58 +01:00 committed by GitHub
commit 2fb0c6cfbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1249 deletions

View File

@ -72,7 +72,7 @@
"@types/jasminewd2": "~2.0.6",
"@types/node": "~10.12.17",
"codelyzer": "~4.5.0",
"electron": "3.0.13",
"electron": "4.0.0",
"electron-builder": "^20.38.3",
"jasmine-core": "~3.3.0",
"jasmine-spec-reporter": "~4.2.1",

1251
yarn.lock

File diff suppressed because it is too large Load Diff