CE upstream - Saturday
Files to resolve:
-
@MadLittleMods Please resolve (UU) package.json
-
@rymai Please resolve (UU) scripts/trigger-build-omnibus
-
@rymai Please resolve (UU) yarn.lock
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2017-11-25
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 Lin Jen-Shin