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.

Sign up for GitHub

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

Jump to bottom

更新 DOCKER_VER 使用新版本格式 #488

Merged
merged 5 commits into from
Mar 28, 2019
Merged

更新 DOCKER_VER 使用新版本格式 #488

merged 5 commits into from
Mar 28, 2019

Conversation

waitingsong
Copy link
Contributor

18.y.z 以后不再带有 -ce 后缀

@gjmzj
Copy link
Collaborator

gjmzj commented Mar 25, 2019

目前有冲突需要处理下

@waitingsong
Copy link
Contributor Author

@gjmzj fixed

@gjmzj
Copy link
Collaborator

gjmzj commented Mar 26, 2019

还是显示冲突，另外一般请提PR到 dev分支

@waitingsong
Copy link
Contributor Author

This branch has no conflicts with the base branch
显示没有冲突了啊？

@gjmzj gjmzj merged commit 97b725b into easzlab:master Mar 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@waitingsong @gjmzj