diff options
| author |  kytwb <kytwb@pm.me> | 2021-03-16 19:07:57 +0100 |
|---|---|---|
| committer | kytwb <kytwb@pm.me> | 2021-03-16 19:07:57 +0100 |
| commit | 76554f63d05a55ef4d0abf9f8ade6c9a297fadda (patch) | |
| tree | db4a25b2953cf9d66f453a83e6d77487722fdb93 | |
| parent | New Crowdin updates (#1230) (diff) | |
| parent | 5.6.0-nightly.18 and trigger AppVeyor nightly build [skip travisci] (diff) | |
| download | ferdium-app-76554f63d05a55ef4d0abf9f8ade6c9a297fadda.tar.gz ferdium-app-76554f63d05a55ef4d0abf9f8ade6c9a297fadda.tar.zst ferdium-app-76554f63d05a55ef4d0abf9f8ade6c9a297fadda.zip | |
Merge branch 'nightly' into develop
| -rw-r--r-- | package-lock.json | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| m--------- | recipes | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/package-lock.json b/package-lock.json index 3b14b3149..3e47d99aa 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.14", | 3 | "version": "5.6.0-nightly.18", |
| 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 39815c0e3..63dabe5bc 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.14", | 6 | "version": "5.6.0-nightly.18", |
| 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", |
diff --git a/recipes b/recipes | |||
| Subproject d5f13d314fd47ed2a0d061a422b566cd90b7ae0 | Subproject 6ce9db9026c9d30df49e1dffee33cc6a69d271b | ||