Skip to content

Conversation

@Nyholm
Copy link
Member

@Nyholm Nyholm commented Dec 28, 2018

This works together with #132

@dbu
Copy link
Contributor

dbu commented Dec 29, 2018

i'll solve the conflict with master in this branch, so that we add the changes from master rather than readd the whole file.

Copy link
Contributor

@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.

merged master into 2.x and rebased this. does this look right to you too @Nyholm ?

@Nyholm
Copy link
Member Author

Nyholm commented Dec 29, 2018

Yes, perfect

@Nyholm Nyholm merged commit 9472484 into 2.x Dec 29, 2018
@Nyholm Nyholm deleted the 2.x-backwards branch December 30, 2018 08:45
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