Backport master into dev to resolve merge conflicts
#283
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Release version v2.1.0
Cut Release with Ropsten support
Version bump for master
Add Sepolia support and remove Kintsugi support
Replace backslashes with forwardslashes
Revert "Replace backslashes with forwardslashes"
hwwhww
approved these changes
Aug 1, 2022
Merged
everhusk
pushed a commit
to earthwallet/earth-wallet-cli
that referenced
this pull request
Aug 3, 2023
Backport `master` into `dev` to resolve merge conflicts
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Despite #282, there are still merge conflicts between
devandmaster, this PR backportsmasterintodevto fix that.