Merge branch 'fix-changelog-7.11-7.12' into 'master'

Fix change log for 7.11 and move entry to 7.12 The change log for 7.11 was accidentally split in 3865a1d9. Additionally, the change added with this commit did not make it into 7.11 according to `git branch --contains` and it has not been cherry picked to 7-11-stable so the entry is moved to 7.12. Refs GH-5625, GH-9318. See merge request !1009

Merge branch 'fix-changelog-7.11-7.12' into 'master'
57f9a1cc · Robert Schilling · e8c14790 · e2524100 · 57f9a1cc
Commit 57f9a1cc authored Jul 20, 2015 by Robert Schilling
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

CHANGELOG CHANGELOG +1 -3

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -134,6 +134,7 @@ v 7.12.0
  - Improve group removing logic
  - Trigger create-hooks on backup restore task
  - Add option to automatically link omniauth and LDAP identities
+  - Allow special character in users bio. I.e.: I <3 GitLab

 v 7.11.4
  - Fix missing bullets when creating lists
@@ -152,9 +153,6 @@ v 7.11.1
 v 7.11.0
  - Fall back to Plaintext when Syntaxhighlighting doesn't work. Fixes some buggy lexers (Hannes Rosenögger)
  - Get editing comments to work in Chrome 43 again.
-  - Allow special character in users bio. I.e.: I <3 GitLab
-
-v 7.11.0
  - Fix broken view when viewing history of a file that includes a path that used to be another file (Stan Hu)
  - Don't show duplicate deploy keys
  - Fix commit time being displayed in the wrong timezone in some cases (Hannes Rosenögger)