Wyatt/1.3.5 merge conflicts #3971
Merged
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
* Change 'tsc' command in scripts & lerna run to 'compile' * Update changelog * Undo incorrect rename * Checking if e2e test is deterministic Co-authored-by: Sam Hodak <[email protected]> Co-authored-by: Sam Hodak <[email protected]>
* Remote node provider edits * remote node provider documentation edits Co-authored-by: smudgil <[email protected]> Co-authored-by: smudgil <[email protected]>
see discussion in the issue #3758 Co-authored-by: LudwikJaniuk <[email protected]> Co-authored-by: LudwikJaniuk <[email protected]>
* Feature/web3 eth iban es6 (#3964) * web3-eth-iban es6 rewrite - replace `var` with `const` and `let` * web3-eth-iban es6 rewrite - replace object prototype with class * web3-eth-iban code style fix Co-authored-by: Loredana <[email protected]> * Update changelog Co-authored-by: Loredana <[email protected]>
frankiebee
approved these changes
Mar 23, 2021
GregTheGreek
approved these changes
Mar 23, 2021
|
Note: Admin override do due github actions bug. Release branch will be tested regardless. |
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.
Solving merge conflicts for #3966 (
CHANGELOG.md) and includes some missing commits for patch release