Skip to content

Move some changelog entries from 0.3.0 to 0.4.0#408

Merged
str4d merged 2 commits intozcash:mainfrom
daira:fix-changelog-entries
Dec 20, 2023
Merged

Move some changelog entries from 0.3.0 to 0.4.0#408
str4d merged 2 commits intozcash:mainfrom
daira:fix-changelog-entries

Conversation

@daira
Copy link
Contributor

@daira daira commented Dec 20, 2023

The changelog changes in #362 had a non-merge conflict with #363, because #362 was implemented as if it would be part of the 0.3.0 release but was in fact merged just afterwards.

fixes #391

The changelog changes in zcash#362 had a non-merge conflict with zcash#363,
because zcash#362 was implemented as if it would be part of the 0.3.0
release but was in fact merged just afterwards.

fixes zcash#391

Signed-off-by: Daira Emma Hopwood <daira@jacaranda.org>
@daira daira requested a review from str4d December 20, 2023 00:22
@daira daira added the documentation Improvements or additions to documentation label Dec 20, 2023
@daira daira added this to the Orchard in Mobile SDKs milestone Dec 20, 2023
nuttycom
nuttycom previously approved these changes Dec 20, 2023
Copy link
Contributor

@nuttycom nuttycom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK, doc-only

@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (c375696) 80.98% compared to head (71d9ddd) 80.98%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #408   +/-   ##
=======================================
  Coverage   80.98%   80.98%           
=======================================
  Files          31       31           
  Lines        3139     3139           
=======================================
  Hits         2542     2542           
  Misses        597      597           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

str4d
str4d previously approved these changes Dec 20, 2023
Copy link
Contributor

@str4d str4d left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK after path fix.

@str4d str4d dismissed stale reviews from nuttycom and themself via a5948cd December 20, 2023 00:56
Copy link
Contributor

@str4d str4d left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re-ACK

@str4d str4d merged commit a0f1aca into zcash:main Dec 20, 2023
@daira daira deleted the fix-changelog-entries branch December 20, 2023 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Move relevant changelog entries from 0.3.0 to 0.4.0

4 participants