Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release 5.0.0 into main #3033

Merged
merged 148 commits into from
Sep 12, 2022
Merged

Merge release 5.0.0 into main #3033

merged 148 commits into from
Sep 12, 2022

Conversation

danielmain
Copy link
Contributor

@danielmain danielmain commented Sep 12, 2022

This PR merges the latest release 5.0.0 into main branch

shawnbusuttil and others added 30 commits April 8, 2022 11:19
…ebuild` forcing proper Electron-Node.js headers
michalrus and others added 23 commits August 19, 2022 14:11
…5.3-and-envs

[DDW-1127] Use `cardano-node` 1.35.3; add `preprod`, `preview`, and `vasil-dev`; remove `testnet`
[DDW-1127] New Yarn scripts to enter `nix-shell`s for new test envs
…en-when-opening-itn-rewards

[DDW-1130] Fix blank screen when opening ITN rewards
…st-registration-hw

[DDW-1134] Fix Catalyst registration with hardware wallets
@danielmain danielmain self-assigned this Sep 12, 2022
@michalrus
Copy link
Member

In this one, the target branch is set to develop, I’ll change it to main

@michalrus michalrus changed the base branch from develop to main September 12, 2022 09:23
Copy link
Member

@michalrus michalrus left a comment

Choose a reason for hiding this comment

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

The commit tree LGTM now! 👍

@danielmain danielmain merged commit df32773 into main Sep 12, 2022
@iohk-bors iohk-bors bot deleted the merge-release-5.0.0-into-main branch September 12, 2022 12:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants