Skip to content

Conversation

@dbu
Copy link
Contributor

@dbu dbu commented Jan 3, 2019

there was a bunch of merge conflicts, so lets check to be sure we don't create regressions

@dbu dbu force-pushed the update-from-master branch from bf94d82 to c216f92 Compare January 3, 2019 12:47
Copy link
Contributor Author

@dbu dbu left a comment

Choose a reason for hiding this comment

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

okay, in the end only the changelog is different

@dbu dbu merged commit 0bf5422 into 2.x Jan 3, 2019
@dbu dbu deleted the update-from-master branch January 3, 2019 12:48
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.

3 participants