Fix some merge conflicts and up to electron 4.2.6

This commit is contained in:
Andrew Morgan
2019-07-12 17:39:31 +01:00
parent b7781ab503
commit f4a7f0dedd
5 changed files with 336 additions and 23 deletions
+1
View File
@@ -69,6 +69,7 @@
"bluebird": "^3.5.2",
"browser-request": "^0.3.3",
"draft-js": "^0.11.0-alpha",
"electron": "4.2.6",
"extract-text-webpack-plugin": "^4.0.0-beta.0",
"favico.js": "^0.3.10",
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",