Skip to content

Merge master (v1.14.0) back to develop #1410

Merged
etoledom merged 6 commits intodevelopfrom
master-v1.14.0-to-develop
Oct 8, 2019
Merged

Merge master (v1.14.0) back to develop #1410
etoledom merged 6 commits intodevelopfrom
master-v1.14.0-to-develop

Conversation

@marecar3
Copy link
Copy Markdown
Contributor

@marecar3 marecar3 commented Oct 4, 2019

Fixes # Brings master 1.14.0 back to develop

To test:

Everything should work as expected in the Editor.

Update release notes:

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

# Conflicts:
#	bundle/android/App.js
#	bundle/android/App.js.map
#	bundle/ios/App.js
#	bundle/ios/App.js.map
#	gutenberg
#	react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
Copy link
Copy Markdown
Contributor

@etoledom etoledom left a comment

Choose a reason for hiding this comment

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

LGTM!
:shipit:

@etoledom etoledom merged commit 0d13e85 into develop Oct 8, 2019
@etoledom etoledom deleted the master-v1.14.0-to-develop branch October 8, 2019 13:41
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.

2 participants