diff options
author | kytwb <kytwb@pm.me> | 2021-12-16 13:35:21 +0100 |
---|---|---|
committer | kytwb <kytwb@pm.me> | 2021-12-16 13:35:21 +0100 |
commit | 13b1c593ecc364ba0db4efc06b33caddb0d0146e (patch) | |
tree | ffcc677f0c5c8da80cffd936ece8e018d8597aaf /package.json | |
parent | 5.6.4-nightly.35 [skip ci] (diff) | |
parent | 5.6.4 (diff) | |
download | ferdium-app-13b1c593ecc364ba0db4efc06b33caddb0d0146e.tar.gz ferdium-app-13b1c593ecc364ba0db4efc06b33caddb0d0146e.tar.zst ferdium-app-13b1c593ecc364ba0db4efc06b33caddb0d0146e.zip |
Merge branch 'release' into develop
# Conflicts:
# package-lock.json
# package.json
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index c5dddae46..c02686db7 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.4-nightly.35", | 6 | "version": "5.6.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", |