Merge pull request #1892 from roramirez/upgrade-electron-6

Upgrade to Electron 6:
MagicMirrorOrg · Jan 23, 2020 · 7fc4f61 · 7fc4f61
2 parents 9f4dc1e + a7ee2ef
commit 7fc4f61
Show file tree

Hide file tree

Showing 3 changed files with 1,524 additions and 2,146 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ before_script:
  - yarn danger ci
  - npm install grunt-cli -g
  - "export DISPLAY=:99.0"
+ - "export ELECTRON_DISABLE_SANDBOX=1"
  - "sh -e /etc/init.d/xvfb start"
  - sleep 5
 script: