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

Fix issue #1923. #1988

Merged
merged 4 commits into from
Dec 28, 2017
Merged

Fix issue #1923. #1988

merged 4 commits into from
Dec 28, 2017

Conversation

geekrainy
Copy link
Contributor

20171110001
20171110002

@ivan-nginx
Copy link
Collaborator

@geekrainy there is conflict with #2044. So, what pull is right?

@ivan-nginx ivan-nginx mentioned this pull request Dec 28, 2017
@ivan-nginx ivan-nginx added this to the v5.1.4 milestone Dec 28, 2017
@ivan-nginx ivan-nginx merged commit 759c20d into iissnan:master Dec 28, 2017
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