6 files changed, 10 insertions, 7 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5086fb3b0..3e573ea76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# [5.5.0](https://github.com/getferdi/ferdi/compare/v5.4.4-beta.3...v5.5.0) (2020-04-17)
+# [5.5.0](https://github.com/getferdi/ferdi/compare/v5.4.3...v5.5.0) (2020-04-26)
 ### Features
 - Merge Franz 5.5.0-beta.2
 - Add dropdown list to choose Todo service (#418, #477), 💖 @yourcontact
@@ -65,12 +65,15 @@
 - Fix Dark Reader blocking services from loading (#285)
 - Fix incorrect body closing tag (#330), 💖 @jereksel
 - Fix DarkReader translation problem (#593)
+- Fix system tray icon tooltip text (#648), 💖 @sampathBlam
+- Enable Dark Reader settings to follow the accent color (#646), 💖 @sampathBlam
 
 ### Build changes
 - Add retry commands to flaky build steps (#498)
 - Run utility scripts pre-commit instead of pre-push (#515)
+- Sign Windows binaries (#635, #633, #112)
 
-# [5.5.0-gm.2](https://github.com/getferdi/ferdi/compare/v5.5.0-gm...v5.5.0-gm.2) (2020-04-22)
+# [5.5.0-gm.2](https://github.com/getferdi/ferdi/compare/v5.5.0-gm...v5.5.0-gm.2) (2020-04-23)
 ### Features
 - Differentiate between indirect and direct notifications (#590), 💖 @Room4O4 @mahadevans87 @FeikoJoosten @sampathBlam
 - Add setting to keep service in hibernation after startup (#577, #584)
@@ -93,7 +96,7 @@
 ### Bug Fixes
 - Fix DarkReader translation problem (#593)
 
-## [5.5.0-gm](https://github.com/getferdi/ferdi/compare/v5.4.4-beta.3...v5.5.0-gm) (2020-04-15)
+## [5.5.0-gm](https://github.com/getferdi/ferdi/compare/v5.4.4-beta.3...v5.5.0-gm) (2020-04-19)
 ### Features
 - Merge Franz 5.5.0-beta.2
 - Add dropdown list to choose Todo service (#418, #477), 💖 @yourcontact
diff --git a/build-helpers/notarize.js b/build-helpers/notarize.js
index 26a627bea..fc463f749 100644
--- a/build-helpers/notarize.js
+++ b/build-helpers/notarize.js
@@ -2,8 +2,7 @@ const { notarize } = require("electron-notarize");
 
 exports.default = async function notarizing(context) {
   const { electronPlatformName, appOutDir } = context;
-  const isTagBuild = process.env.TRAVIS_TAG;
-  if (electronPlatformName !== "darwin" || !isTagBuild) {
+  if (electronPlatformName !== "darwin" || process.env.TRAVIS_BRANCH !== 'release') {
     return;
   }
 
diff --git a/electron-builder.yml b/electron-builder.yml
index 330fc64e1..86349ba6b 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -37,6 +37,7 @@ win:
       arch: [x64, ia32]
     - target: portable
       arch: [x64, ia32]
+  publisherName: 'Amine Mouafik'
 
 linux:
   icon: ./build-helpers/images/icons
diff --git a/package-lock.json b/package-lock.json
index f117141f5..65294a3a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ferdi",
-  "version": "5.5.0-gm.2",
+  "version": "5.5.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b97312e3d..01b902bc0 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "ferdi",
   "productName": "Ferdi",
   "appId": "com.kytwb.ferdi",
-  "version": "5.5.0-gm.2",
+  "version": "5.5.0",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "kytwb",
   "main": "index.js",
diff --git a/recipes b/recipes
-Subproject 911d1ded846165a4b420efa2b58668ad27c9f2c
+Subproject 3054fd4c362b5be81b5cdd48535a0e7078fcd0a