Merge branch 'add-merge-conflict-changelog-item' into 'master'

Add merge conflict resolution to CHANGELOG 😊 See merge request !5863

Merge branch 'add-merge-conflict-changelog-item' into 'master'
Add merge conflict resolution to CHANGELOG 😊 See merge request !5863
3e7f62b5 · Douwe Maan · Ruben Davila · 2f477024 · 3e7f62b5
Commit 3e7f62b5 authored Aug 18, 2016 by Douwe Maan Committed by Ruben Davila Aug 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

CHANGELOG CHANGELOG +1 -0

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@ v 8.11.0 (unreleased)
  - Rename `markdown_preview` routes to `preview_markdown`. (Christopher Bartz)
  - Update to Ruby 2.3.1. !4948
  - Add Issues Board !5548
+  - Allow resolving merge conflicts in the UI !5479
  - Improve diff performance by eliminating redundant checks for text blobs
  - Ensure that branch names containing escapable characters (e.g. %20) aren't unescaped indiscriminately. !5770 (ewiltshi)
  - Convert switch icon into icon font (ClemMakesApps)