Merge branch 'fix-conflicts-exception-for-submodules' into 'master'
Make sure ConflictsService does not raise for conflicting submodules See merge request gitlab-org/gitlab-ce!20528
Showing
想要评论请 注册 或 登录
Make sure ConflictsService does not raise for conflicting submodules See merge request gitlab-org/gitlab-ce!20528