Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge/v1.1.3 to develop #801

Merged
merged 7 commits into from
Apr 2, 2019
Merged

Merge/v1.1.3 to develop #801

merged 7 commits into from
Apr 2, 2019

Conversation

mzorz
Copy link
Contributor

@mzorz mzorz commented Apr 1, 2019

Merge master back to develop.

Created a new branch off master, merged develop into it, fixed merge conflict and created new JS bundles from the merge of both master and develop, as done previously in similar situation in #792

Everything has been tested on:
gutenberg-mobile: #798
WPiOS: N/A as no changes there
WPAndroid: wordpress-mobile/WordPress-Android#9502

Copy link
Contributor

@jtreanor jtreanor 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 but it seems you still have some conflicts to resolve.

Copy link
Contributor

@jtreanor jtreanor left a comment

Choose a reason for hiding this comment

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

I've resolved the conflict. Will merge when green.

@jtreanor jtreanor merged commit 7a463e9 into develop Apr 2, 2019
@jtreanor jtreanor deleted the merge/v1.1.3-to-develop branch April 2, 2019 08:35
@mzorz
Copy link
Contributor Author

mzorz commented Apr 2, 2019

Thank you @jtreanor!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants