Merge conflict resolution (!5479) · Merge requests · GitLab.org / GitLab FOSS

Project 'gitlab-org/gitlab-ce' was moved to 'gitlab-org/gitlab-foss'. Please update any links and bookmarks that may still have the old path.

Sean McGivern requested to merge mc-ui into master Jul 25, 2016

Merge conflict resolution