Merge package.json, match version in electron/package.json

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2017-05-05 17:03:28 +01:00
commit a09f890619
53 changed files with 1046 additions and 484 deletions

1
.gitignore vendored
View file

@ -13,3 +13,4 @@
npm-debug.log
electron/dist
electron/pub
/config.json