diff options
| author |  Vijay A <vraravam@users.noreply.github.com> | 2022-05-26 19:02:18 -0500 |
|---|---|---|
| committer | Vijay A <vraravam@users.noreply.github.com> | 2022-05-26 19:02:18 -0500 |
| commit | 8af8c0d374c0a8f53f64c695e91c0232d0b0f606 (patch) | |
| tree | 6525f77692cf889f02ba7954d5349d4052cf453c | |
| parent | Update documentation for new unquantining Ferdium on macos [skip ci] (diff) | |
| download | ferdium-app-6.0.0-beta.1.tar.gz ferdium-app-6.0.0-beta.1.tar.zst ferdium-app-6.0.0-beta.1.zip | |
Merged from 'develop'; Changed version to '6.0.0-beta.1'; Updated 'recipes' submodulev6.0.0-beta.1
| -rw-r--r-- | package-lock.json | 4 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| m--------- | recipes | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/package-lock.json b/package-lock.json index 9bded9736..723c63575 100644 --- a/package-lock.json +++ b/package-lock.json | |||
| @@ -1,12 +1,12 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "ferdium", | 2 | "name": "ferdium", |
| 3 | "version": "6.0.0-nightly.47", | 3 | "version": "6.0.0-beta.1", |
| 4 | "lockfileVersion": 2, | 4 | "lockfileVersion": 2, |
| 5 | "requires": true, | 5 | "requires": true, |
| 6 | "packages": { | 6 | "packages": { |
| 7 | "": { | 7 | "": { |
| 8 | "name": "ferdium", | 8 | "name": "ferdium", |
| 9 | "version": "6.0.0-nightly.47", | 9 | "version": "6.0.0-beta.1", |
| 10 | "license": "Apache-2.0", | 10 | "license": "Apache-2.0", |
| 11 | "dependencies": { | 11 | "dependencies": { |
| 12 | "@adonisjs/ace": "^5.1.0", | 12 | "@adonisjs/ace": "^5.1.0", |
diff --git a/package.json b/package.json index e5411ad31..f73d22489 100644 --- a/package.json +++ b/package.json | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | "productName": "Ferdium", | 3 | "productName": "Ferdium", |
| 4 | "desktopName": "ferdium.desktop", | 4 | "desktopName": "ferdium.desktop", |
| 5 | "appId": "org.ferdium.ferdium-app", | 5 | "appId": "org.ferdium.ferdium-app", |
| 6 | "version": "6.0.0-nightly.47", | 6 | "version": "6.0.0-beta.1", |
| 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 | "author": "Ferdium Contributors <hello@ferdium.org> (https://ferdium.org/)", | 8 | "author": "Ferdium Contributors <hello@ferdium.org> (https://ferdium.org/)", |
| 9 | "license": "Apache-2.0", | 9 | "license": "Apache-2.0", |
diff --git a/recipes b/recipes | |||
| Subproject 4983daff125009865f8482388c37f69de8a610f | Subproject cd64405f7f4f94c83a59e720ca2615c89b00d91 | ||