Merge branch 'master' into electron-builder

# Conflicts: # package.json
james-proxy · May 17, 2016 · 845b3e9 · 845b3e9
2 parents 7246bd9 + 3f8f469
commit 845b3e9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "electron-builder": "^3.17.1",
     "electron-connect": "^0.4.0",
     "electron-localshortcut": "^0.6.0",
-    "electron-prebuilt": "1.0.2",
+    "electron-prebuilt": "1.1.0",
     "envify": "^3.4.0",
     "eslint": "^2.2.0",
     "eslint-plugin-react": "^5.0.1",