From 30f39115c9be305167eeaef26ed62c5a5de6e24a Mon Sep 17 00:00:00 2001 From: Nikola Glumac Date: Mon, 22 Feb 2021 14:06:56 +0100 Subject: [PATCH 1/2] Bump Daedalus version --- CHANGELOG.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d33803e46..b1ecb89364 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ Changelog ========= -## vNext +## 3.3.1 ### Features diff --git a/package.json b/package.json index 79f96aba79..cef7d2c47a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "daedalus", "productName": "Daedalus", - "version": "3.3.0", + "version": "3.3.1", "description": "Cryptocurrency Wallet", "main": "./dist/main/index.js", "scripts": { From a8ffcdb907d2c7d8d9e2cff094b383451142897f Mon Sep 17 00:00:00 2001 From: Nikola Glumac Date: Thu, 25 Feb 2021 17:39:34 +0100 Subject: [PATCH 2/2] Merges develop --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6888a720f1..4b6209a4c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Changelog ========= +## vNext + +### Chores + +- Adjusted hover PopOver styles on the first tile in the delegation center screen ([PR 2386](https://github.com/input-output-hk/daedalus/pull/2386)) + ## 3.3.1 ### Features @@ -14,7 +20,6 @@ Changelog ### Chores -- Adjusted hover PopOver styles on the first tile in the delegation center screen ([PR 2386](https://github.com/input-output-hk/daedalus/pull/2386)) - Enabled selecting whole addresses and ids when selecting them to copy on transactions and summary screens ([PR 2370](https://github.com/input-output-hk/daedalus/pull/2370)) - Added missing whitespace between amount and ADA in Japanese ([PR 2380](https://github.com/input-output-hk/daedalus/pull/2380)) - Updated link "Follow instructions and manually update" on testnet and flight ([PR 2372](https://github.com/input-output-hk/daedalus/pull/2372))