CE upstream - 2018-06-25 09:23 UTC
Files to resolve:
-
@victorwu Please resolve (AA) doc/user/project/img/group_issue_board.png
-
Oswaldo Ferreira Please resolve (AA) doc/user/project/img/issue_board_creation.png
-
Oswaldo Ferreira Please resolve (AA) doc/user/project/img/issue_board_edit_button.png
-
Oswaldo Ferreira Please resolve (AA) doc/user/project/img/issue_board_view_scope.png
-
Annabel Dunstone Gray Please resolve (AA) doc/user/project/img/issue_boards_multiple.png
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-06-25
branch.
Thanks in advance!
@victorwu 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