CE upstream - 2018-11-12 00:21 UTC
Files to resolve:
-
Marcel Amirault Please resolve (UU) doc/ci/examples/deployment/composer-npm-deploy.md
-
Marcel Amirault Please resolve (UU) doc/development/documentation/styleguide.md
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-11-12
branch.
Thanks in advance!
@rymai 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!