Add merge conflict resolution to CHANGELOG (!5863) · Merge requests · GitLab.org / GitLab FOSS · GitLab

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

username-removed-443319 requested to merge add-merge-conflict-changelog-item into master Aug 18, 2016

😊