Merge 1.9.4/5 into v2.0-integration #3375
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
…esult-type Fix #1441
|
|
# Conflicts: # packages/toolkit/package.json # packages/toolkit/src/configureStore.ts # packages/toolkit/src/createAction.ts # packages/toolkit/src/listenerMiddleware/index.ts # packages/toolkit/src/query/tests/createApi.test.ts # packages/toolkit/src/tsHelpers.ts # packages/toolkit/src/utils.ts # website/package.json # yarn.lock
markerikson
force-pushed
the
feature/2.0-alpha-merge-1.9
branch
from
417d3de
to
1feb9ba
Compare
|
This pull request is automatically built and testable in CodeSandbox. To see build info of the built libraries, click here or the icon next to each commit SHA. Latest deployment of this branch, based on commit 1feb9ba:
|
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.
Some tricky merge conflicts, so PR-ing this one.