7 files changed, 8 insertions, 6 deletions

diff --git a/.travis.yml b/.travis.yml
index d5f1dd0c0..80b9dedd1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ before_install:
     if [ $TRAVIS_BRANCH == "nightly" ]; then
       git remote add source https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1
       git fetch source
-      git merge --no-ff --commit --no-edit source/develop
+      git merge --no-ff --commit -m "Merge remote-tracking branch 'source/develop' into HEAD [skip ci]" source/develop
       CHANGES_COUNT=$(git diff --stat HEAD origin/nightly | wc -l)
       echo $TRAVIS_EVENT_TYPE
       echo $changes
@@ -40,7 +40,7 @@ before_install:
       else
         git submodule update --remote --force
         git add .
-        git diff-index --quiet HEAD || git commit -m "Update submodules"
+        git commit -m "Update submodules [skip ci]" || true
       fi
     fi
 install:
@@ -57,6 +57,8 @@ script:
     fi
   - |
     if [ $TRAVIS_BRANCH == "nightly" ]; then
+      git add .
+      git commit -m "Apply linter fixes [skip ci]"
       npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip travisci]"
       echo "Building..."
       travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies
diff --git a/electron-builder.yml b/electron-builder.yml
index f43e33950..86349ba6b 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -18,6 +18,8 @@ mac:
     NSMicrophoneUsageDescription: "This app requires camera access for video messaging services."
     NSCameraUsageDescription: "This app requires microphone access for audio messaging services."
 
+afterSign: ./build-helpers/notarize.js
+
 dmg:
   background: ./build-helpers/images/dmgInstaller.tiff
   icon: ./build-helpers/images/icon.icns
diff --git a/package-lock.json b/package-lock.json
index 20dbebbef..bd9dd52bb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ferdi",
-  "version": "5.6.0-nightly.1",
+  "version": "5.6.0-nightly.13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9705475be..83a49e6a9 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "Ferdi",
   "desktopName": "ferdi.desktop",
   "appId": "com.kytwb.ferdi",
-  "version": "5.6.0-beta.4",
+  "version": "5.6.0-nightly.13",
   "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 c40fae916884a1754cec8d3ec28b5cdfc7e5370
+Subproject 822c5680c0461c90468cd8a69a37e3354376c73
diff --git a/src/electron/ipc-api/appIndicator.js b/src/electron/ipc-api/appIndicator.js
index bea8e7751..70f14d95e 100644
--- a/src/electron/ipc-api/appIndicator.js
+++ b/src/electron/ipc-api/appIndicator.js
@@ -25,7 +25,6 @@ export default (params) => {
   });
 
   ipcMain.on('updateAppIndicator', (event, args) => {
-
     // Flash TaskBar for windows, bounce Dock on Mac
     if (!app.mainWindow.isFocused()) {
       if (params.settings.app.get('notifyTaskBarOnMessage')) {
diff --git a/src/index.js b/src/index.js
index cce8d8ea0..28bbe19c1 100644
--- a/src/index.js
+++ b/src/index.js
@@ -61,7 +61,6 @@ if (isWindows) {
 }
 
 
-
 // Globally set useragent to fix user agent override in service workers
 debug('Set userAgent to ', userAgent());
 app.userAgentFallback = userAgent();