diff options
| author |  vantezzen <hello@vantezzen.io> | 2019-10-01 07:46:34 +0200 |
|---|---|---|
| committer | vantezzen <hello@vantezzen.io> | 2019-10-01 07:46:34 +0200 |
| commit | 569ea01bb34148816ee448be54e25bd1099f1faa (patch) | |
| tree | 6150d59213348a0d36f7cf9ebdf93a7e83b7b444 | |
| parent | Ignore settings.app.serverMoneyInfo when applying branding (diff) | |
| parent | Add note regarding draft release and assets upload (diff) | |
| download | ferdium-app-569ea01bb34148816ee448be54e25bd1099f1faa.tar.gz ferdium-app-569ea01bb34148816ee448be54e25bd1099f1faa.tar.zst ferdium-app-569ea01bb34148816ee448be54e25bd1099f1faa.zip | |
Merge branch 'master' of https://github.com/getferdi/ferdi
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | package-lock.json | 2 | ||||
| -rw-r--r-- | package.json | 2 |
3 files changed, 3 insertions, 3 deletions
| @@ -103,7 +103,7 @@ $ git tag v5.3.4-beta.4 | |||
| 103 | $ git push --tags | 103 | $ git push --tags |
| 104 | ``` | 104 | ``` |
| 105 | 105 | ||
| 106 | When pushing a new tag, the CI build will create a draft GitHub release and upload the deliverables in the release assets. | 106 | When pushing a new tag, the CI build will create a draft GitHub release and upload the deliverables in the draft release assets. Wait for all the assets to be uploaded before publishing the draft release. |
| 107 | 107 | ||
| 108 | ## Contributors ✨ | 108 | ## Contributors ✨ |
| 109 | 109 | ||
diff --git a/package-lock.json b/package-lock.json index 70c791007..ea16b11d1 100644 --- a/package-lock.json +++ b/package-lock.json | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | { | 1 | { |
| 2 | "name": "ferdi", | 2 | "name": "ferdi", |
| 3 | "version": "5.3.4-beta.3", | 3 | "version": "5.3.4-beta.6", |
| 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 1a24c54fb..e336ec516 100644 --- a/package.json +++ b/package.json | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | "name": "ferdi", | 2 | "name": "ferdi", |
| 3 | "productName": "Ferdi", | 3 | "productName": "Ferdi", |
| 4 | "appId": "com.kytwb.ferdi", | 4 | "appId": "com.kytwb.ferdi", |
| 5 | "version": "5.3.4-beta.5", | 5 | "version": "5.3.4-beta.6", |
| 6 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", | 6 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", |
| 7 | "copyright": "kytwb", | 7 | "copyright": "kytwb", |
| 8 | "main": "index.js", | 8 | "main": "index.js", |