TRACKING: master → feature/react-intl #1136
Closed
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
[feature/redux] Isomorphic redirect
Conflicts: src/client.js src/components/App/App.js src/server.js
[feature/react-intl] merge feature/redux
[feature/react-intl] Better code in setLocale action
[feature/redux] Exclude `navigate` from <a> in Link component [closes #788]
Conflicts: src/server.js
Conflicts: src/server.js
[feature/react-intl] Convert backslashes in messages files to slashes
Conflicts: package.json src/client.js
Conflicts: package.json src/client.js src/components/Html.js
[feature/react-intl] Sort paths in messages
Conflicts: package.json src/components/Link/Link.js
Conflicts: package.json src/client.js tools/copy.js
babel core supports a transformFileSync method which this process would highly benefit from
|
should these be closed since they are outdated |
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.
This will not be closed. This is tracking PR for keeping feature branches in sync:
See #1084 —
master→feature/reduxSee #1135 —
feature/redux→feature/react-intl