CE upstream - 2018-11-21 20:21 UTC
Files to resolve:
-
@gitlab-release-tools-bot Please resolve (UU) CHANGELOG.md
-
@kencjohnston Please resolve (AA) PHILOSOPHY.md
-
@felipe_artur Please resolve (UU) doc/user/discussions/index.md
-
@victorwu Please resolve (UU) doc/user/project/labels.md
-
@filipa Please resolve (UU) locale/gitlab.pot
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-11-21
branch.
Thanks in advance!
@kencjohnston 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 Steve Xuereb