Merge branch 'develop'v5.5.0-gm

1 files changed, 11 insertions, 8 deletions

diff --git a/package.json b/package.json
index 9f4f4b63e..becd0d227 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "ferdi",
   "productName": "Ferdi",
   "appId": "com.kytwb.ferdi",
-  "version": "5.4.4-beta.3",
+  "version": "5.5.0-gm",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "kytwb",
   "main": "index.js",
@@ -76,7 +76,8 @@
     "electron-process-reporter": "git+https://git@github.com/dizer/electron-process-reporter.git",
     "electron-react-titlebar": "0.8.2",
     "electron-spellchecker": "2.2.1",
-    "electron-updater": "4.2.0",
+    "electron-updater": "4.2.5",
+    "electron-util": "0.14.0",
     "electron-window-state": "5.0.3",
     "fs-extra": "7.0.1",
     "gulp-csso": "3.0.1",
@@ -85,8 +86,10 @@
     "gulp-uglify": "3.0.2",
     "hex-to-rgba": "1.0.2",
     "jsonwebtoken": "8.5.1",
-    "lodash": "4.17.15",
-    "marked": "0.7.0",
+    "lodash": "^4.17.4",
+    "mac-screen-capture-permissions": "1.1.0",
+    "macos-version": "5.2.0",
+    "marked": "0.6.1",
     "mdi": "^1.9.33",
     "mime-types": "2.1.25",
     "mobx": "5.15.0",
@@ -138,7 +141,7 @@
     "@babel/preset-react": "7.7.4",
     "@babel/register": "7.7.4",
     "@types/classnames": "^2.2.6",
-    "@types/color": "^3.0.0",
+    "@types/color": "3.0.0",
     "@types/color-convert": "^1.9.0",
     "@types/jss": "^9.5.7",
     "@types/lodash": "4.14.149",
@@ -154,8 +157,8 @@
     "cross-env": "^5.0.5",
     "cz-conventional-changelog": "2.1.0",
     "dotenv": "^4.0.0",
-    "electron": "8.0.0",
-    "electron-builder": "21.2.0",
+    "electron": "8.1.1",
+    "electron-builder": "22.4.1",
     "electron-notarize": "0.2.1",
     "electron-rebuild": "1.10.0",
     "eslint": "5.10.0",
@@ -203,7 +206,7 @@
   ],
   "husky": {
     "hooks": {
-      "pre-push": "npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding"
+      "pre-commit": "npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding"
     }
   }
 }