Skip to content

Master -> Develop (1.17)#1584

Merged
mchowning merged 141 commits intodevelopfrom
master_develop_1.17_merge
Nov 18, 2019
Merged

Master -> Develop (1.17)#1584
mchowning merged 141 commits intodevelopfrom
master_develop_1.17_merge

Conversation

@mchowning
Copy link
Copy Markdown
Contributor

@mchowning mchowning commented Nov 15, 2019

This PR is to bring the changes from the master branch back into develop. This PR should not be merged until after the 1.17 gutenberg web-side changes are merged (related PR related PR) back into the gutenberg repository's master branch, and this PR is updated to have a submodule reference to that new commit.

Update release notes:

  • If there are user facing changes, I have added an item to RELEASE-NOTES.txt.

marecar3 and others added 30 commits September 30, 2019 13:14
Increment gb-mobile version to 1.14.0
Update bundle files
# Conflicts:
#	package.json
…pens_safari

Don't allow interactions with URL in Aztec text blocks.
# Conflicts:
#	gutenberg
…Content-is-missing-on-long-posts-in-html-mode

Fix/1268 content is missing on long posts in html mode
# Conflicts:
#	bundle/android/App.js
#	bundle/android/App.js.map
#	bundle/ios/App.js
#	bundle/ios/App.js.map
#	gutenberg
#	react-native-aztec/ios/Cartfile
#	react-native-aztec/ios/Cartfile.resolved
#	react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
@mchowning mchowning changed the title Master -> Develop Master -> Develop (1.17) Nov 15, 2019
Copy link
Copy Markdown
Contributor

@cameronvoell cameronvoell left a comment

Choose a reason for hiding this comment

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

Looks good! Tested on WPiOS and WPAndroid.

@mchowning mchowning merged commit 85f759c into develop Nov 18, 2019
@mchowning mchowning deleted the master_develop_1.17_merge branch November 18, 2019 22:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants