Merge branch 'master' into dev

2016-06-17 23:39:45 +09:00
parent 04839a630e 2b7dc1190e
commit 517cc16835
13 changed files with 172 additions and 50 deletions
--- a/src/package.json
+++ b/src/package.json
@@ -13,6 +13,7 @@
    "electron-connect": "^0.3.3"
  },
  "dependencies": {
+    "auto-launch": "^2.0.1",
    "bootstrap": "^3.3.6",
    "electron-squirrel-startup": "^1.0.0",
    "os-locale": "^1.4.0",