Merge blocks of different types #213
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
hypest
reviewed
Nov 1, 2018
package.json
Outdated
| @@ -43,7 +43,8 @@ | |||
| "regenerator-runtime": "^0.12.1", | |||
| "remote-redux-devtools": "^0.5.12", | |||
| "rungen": "^0.3.2", | |||
| "sprintf-js": "^1.1.1" | |||
| "sprintf-js": "^1.1.1", | |||
| "turbo-combine-reducers": "^1.0.2" | |||
There was a problem hiding this comment.
A fix about this has been merged into master so, feel free to update the PR @daniloercoli
…g-mobile into issue/167-merge-blocks-different-types * 'master' of https://github.com/wordpress-mobile/gutenberg-mobile: (27 commits) Point to latest from RecyclerViewList Point to latest react-native-aztec Adding yarn.lock field for `turbo-combine-reducers`. Added turbo-combine-reducers dependency to fix failed builds Update subrepo ref to point to master again Update subrepo ref No need for change of default Jest platform Update subrepo ref Update subrepo ref Fix lint warnings Mocking `react-native-gutenberg-bridge` to make iOS tests pass. From: jestjs/jest#2208 (comment) rn-gutenberg-bridge: Adding dumb iOS implementation to avoid errors. Revert "Update gutenberg subproject ref" Add react-native-hr library to add styled line+text elements easily Update gutenberg subproject ref Match wpandroid's Android API levels Remove plugin from Babel to make wpandroid release build work Fix wpandroid checkstyle issues Remove dep, Matro will find the package automagically Fix indentation ... # Conflicts: # gutenberg
Update GB hash
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.
Description:
This PR adds the ability of merging blocks of different types.
Moves #167 forward.
Related PRs:
Gutenberg side: WordPress/gutenberg#11294 )(already merged!)
Testing: