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 | |
| 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
| -rw-r--r-- | package-lock.json | 4 | ||||
| -rw-r--r-- | package.json | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package-lock.json b/package-lock.json index d6402d47f..71b24946b 100644 --- a/package-lock.json +++ b/package-lock.json | |||
| @@ -1,12 +1,12 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "ferdi", | 2 | "name": "ferdi", |
| 3 | "version": "5.6.4-nightly.35", | 3 | "version": "5.6.4", |
| 4 | "lockfileVersion": 2, | 4 | "lockfileVersion": 2, |
| 5 | "requires": true, | 5 | "requires": true, |
| 6 | "packages": { | 6 | "packages": { |
| 7 | "": { | 7 | "": { |
| 8 | "name": "ferdi", | 8 | "name": "ferdi", |
| 9 | "version": "5.6.4-nightly.35", | 9 | "version": "5.6.4", |
| 10 | "license": "Apache-2.0", | 10 | "license": "Apache-2.0", |
| 11 | "dependencies": { | 11 | "dependencies": { |
| 12 | "@adonisjs/ace": "^5.0.8", | 12 | "@adonisjs/ace": "^5.0.8", |
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", |