Skip to content

CE upstream - Saturday

🤖 GitLab Bot 🤖 requested to merge ce-to-ee-2017-12-16 into master

Files to resolve:

Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2017-12-16 branch.

Thanks in advance!

Note: This merge request was created by an automated script. Please report any issue at https://gitlab.com/gitlab-org/release-tools/issues!

Edited by Nick Thomas

Merge request reports