Skip to content
This repository was archived by the owner on Oct 6, 2025. It is now read-only.

Backport master into dev to resolve merge conflicts#283

Merged
CarlBeek merged 10 commits intodevfrom
settings_patch_3
Aug 1, 2022
Merged

Backport master into dev to resolve merge conflicts#283
CarlBeek merged 10 commits intodevfrom
settings_patch_3

Conversation

@CarlBeek
Copy link
Copy Markdown
Collaborator

@CarlBeek CarlBeek commented Aug 1, 2022

Despite #282, there are still merge conflicts between dev and master, this PR backports master into dev to fix that.

@CarlBeek CarlBeek requested a review from hwwhww August 1, 2022 10:55
@CarlBeek CarlBeek merged commit 4da5add into dev Aug 1, 2022
@CarlBeek CarlBeek deleted the settings_patch_3 branch August 1, 2022 11:00
@CarlBeek CarlBeek mentioned this pull request Aug 1, 2022
Copy link
Copy Markdown

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Good

sangheraio 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 subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants