diff options
| author |  kytwb <kytwb@pm.me> | 2022-03-02 13:55:08 +0100 |
|---|---|---|
| committer | kytwb <kytwb@pm.me> | 2022-03-02 13:55:08 +0100 |
| commit | 802c7d9a1239915bdbff3972d02de47417feb4ab (patch) | |
| tree | 4133362d2c9a28c33dd1737ead8ea001262255b7 | |
| parent | 5.7.1-nightly.19 [skip ci] (diff) | |
| parent | 5.8.0 (diff) | |
| download | ferdium-app-802c7d9a1239915bdbff3972d02de47417feb4ab.tar.gz ferdium-app-802c7d9a1239915bdbff3972d02de47417feb4ab.tar.zst ferdium-app-802c7d9a1239915bdbff3972d02de47417feb4ab.zip | |
Merge branch 'release' into develop
# Conflicts:
# package-lock.json
# package.json
| -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 8a31942bc..1ae8a4ba7 100644 --- a/package-lock.json +++ b/package-lock.json | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "ferdi", | 2 | "name": "ferdi", |
| 3 | "version": "5.7.1-nightly.19", | 3 | "version": "5.8.0", |
| 4 | "lockfileVersion": 2, | 4 | "lockfileVersion": 2, |
| 5 | "requires": true, | 5 | "requires": true, |
| 6 | "packages": { | 6 | "packages": { |
diff --git a/package.json b/package.json index 6885bf68a..af6193443 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.7.1-nightly.19", | 6 | "version": "5.8.0", |
| 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", |