CE upstream - 2018-08-15 15:21 UTC
Files to resolve:
-
@dzaporozhets Please resolve (UU) db/schema.rb
-
@dosuken123 Please resolve (UU) doc/README.md
-
@dosuken123 Please resolve (UU) doc/ci/examples/README.md
-
@dosuken123 Please resolve (UU) doc/user/project/merge_requests/index.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-08-15
branch.
Thanks in advance!
@dosuken123 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 Achilleas Pipinellis