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

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-05 17:03:28 +01:00
parent 499b04c254 e1cd046c1a
commit a09f890619
53 changed files with 1046 additions and 484 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 npm-debug.log
 electron/dist
 electron/pub
+/config.json