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

Fix issue 173 #328

Merged
merged 5 commits into from Jan 2, 2018

Conversation

Projects
None yet
4 participants
@mtoma
Contributor

mtoma commented Dec 14, 2017

No description provided.

@mtoma mtoma requested review from mattias-p and matsduf Dec 14, 2017

@sandoche2k

This comment has been minimized.

Show comment
Hide comment
@sandoche2k

sandoche2k Dec 19, 2017

Contributor

@mattias-p and @matsduf can you have a look?

Contributor

sandoche2k commented Dec 19, 2017

@mattias-p and @matsduf can you have a look?

@mtoma

This comment has been minimized.

Show comment
Hide comment
@mtoma

mtoma Dec 19, 2017

Contributor
Contributor

mtoma commented Dec 19, 2017

@sandoche2k sandoche2k added this to the 2017.4 milestone Dec 19, 2017

@sandoche2k

This comment has been minimized.

Show comment
Hide comment
@sandoche2k

sandoche2k Dec 21, 2017

Contributor

@mtoma please merge after resolving the conflicts

Contributor

sandoche2k commented Dec 21, 2017

@mtoma please merge after resolving the conflicts

@mattias-p

This comment has been minimized.

Show comment
Hide comment
@mattias-p

mattias-p Dec 21, 2017

Contributor

When resolving the conflict, please also exclude my merge commit from this PR. It doesn't belong here.

Contributor

mattias-p commented Dec 21, 2017

When resolving the conflict, please also exclude my merge commit from this PR. It doesn't belong here.

@matsduf

Rebase is better than merge.

@mattias-p

Please squash this when merging and provide a cleaned up summary in the message.

@sandoche2k

This comment has been minimized.

Show comment
Hide comment
@sandoche2k

sandoche2k Jan 2, 2018

Contributor

@mtoma Pls. check and merge

Contributor

sandoche2k commented Jan 2, 2018

@mtoma Pls. check and merge

@matsduf

This comment has been minimized.

Show comment
Hide comment
@matsduf

matsduf Jan 2, 2018

Contributor

This PR is a resolution of #173

Contributor

matsduf commented Jan 2, 2018

This PR is a resolution of #173

@mtoma mtoma merged commit aa054e9 into zonemaster:develop Jan 2, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment