Skip to content

Merge 1.17.1 -> 1.18.0 (v2)#1624

Merged
Tug merged 10 commits intorelease/1.18.0from
master-1.7.1-merge-to-release-1.18
Nov 27, 2019
Merged

Merge 1.17.1 -> 1.18.0 (v2)#1624
Tug merged 10 commits intorelease/1.18.0from
master-1.7.1-merge-to-release-1.18

Conversation

@Tug
Copy link
Copy Markdown
Contributor

@Tug Tug commented Nov 27, 2019

Superseeds #1623

This PR merges changes from master (1.17.1) into the current release branch (1.18.0)

See #1622

Update release notes:

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

@Tug Tug requested a review from hypest November 27, 2019 09:47
@Tug Tug self-assigned this Nov 27, 2019
@Tug Tug changed the base branch from develop to release/1.18.0 November 27, 2019 09:48
Copy link
Copy Markdown
Contributor

@hypest hypest left a comment

Choose a reason for hiding this comment

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

LGTM!

To be sure, should we also update the strings again after merging this? I think the string changes here are just what the original commits included, right?

@Tug
Copy link
Copy Markdown
Contributor Author

Tug commented Nov 27, 2019

To be sure, should we also update the strings again after merging this? I think the string changes here are just what the original commits included, right?

Yes and yes :)

Thanks for the review @hypest 🎉

@Tug Tug merged commit 2748621 into release/1.18.0 Nov 27, 2019
@Tug Tug deleted the master-1.7.1-merge-to-release-1.18 branch November 27, 2019 11:05
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