CE upstream - 2018-01-25 21:23 UTC
Files to resolve:
-
@jacobvosmaer-gitlab Please resolve (AA) scripts/lint-rugged
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-01-25
branch.
Thanks in advance!
@jacobvosmaer-gitlab After you resolved the conflicts, please assign to the next person. If you're the last one to resolve the conflicts, please push this to be merged.
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 Robert Speicher