diff options
author | Amine Mouafik <amine@mouafik.fr> | 2020-10-03 11:28:48 +0100 |
---|---|---|
committer | Amine Mouafik <amine@mouafik.fr> | 2020-10-03 11:28:48 +0100 |
commit | c8d8e0bc06c8dbb2ccd864a9e11fefd4ae35a376 (patch) | |
tree | 6b9e60a21abe3fd4959461af7a8efadd734433c4 | |
parent | Update documentation on nightly releases (diff) | |
parent | 5.6.0-nightly.4 and trigger AppVeyor nightly build [skip travisci] (diff) | |
download | ferdium-app-c8d8e0bc06c8dbb2ccd864a9e11fefd4ae35a376.tar.gz ferdium-app-c8d8e0bc06c8dbb2ccd864a9e11fefd4ae35a376.tar.zst ferdium-app-c8d8e0bc06c8dbb2ccd864a9e11fefd4ae35a376.zip |
Merge branch 'nightly' of github.com:getferdi/ferdi into nightly
-rw-r--r-- | package-lock.json | 2 | ||||
-rw-r--r-- | package.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package-lock.json b/package-lock.json index c78933fa8..710e11e2b 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "name": "ferdi", | 2 | "name": "ferdi", |
3 | "version": "5.6.0-nightly.3", | 3 | "version": "5.6.0-nightly.4", |
4 | "lockfileVersion": 1, | 4 | "lockfileVersion": 1, |
5 | "requires": true, | 5 | "requires": true, |
6 | "dependencies": { | 6 | "dependencies": { |
diff --git a/package.json b/package.json index 25322911d..99792eff7 100644 --- a/package.json +++ b/package.json | |||
@@ -3,7 +3,7 @@ | |||
3 | "productName": "Ferdi", | 3 | "productName": "Ferdi", |
4 | "desktopName": "ferdi.desktop", | 4 | "desktopName": "ferdi.desktop", |
5 | "appId": "com.kytwb.ferdi", | 5 | "appId": "com.kytwb.ferdi", |
6 | "version": "5.6.0-nightly.3", | 6 | "version": "5.6.0-nightly.4", |
7 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", | 7 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", |
8 | "copyright": "kytwb", | 8 | "copyright": "kytwb", |
9 | "main": "index.js", | 9 | "main": "index.js", |