From c24906016fded766b713dfff504d7866dcecf379 Mon Sep 17 00:00:00 2001
From: Job van der Voort <job@gitlab.com>
Date: Fri, 22 May 2015 14:43:37 +0000
Subject: [PATCH] update CHANGELOG with release 7.11.1

---
 CHANGELOG | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d8474968179..edb7970c233 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,7 +6,10 @@ v 7.12.0 (unreleased)
   - Update Asciidoctor gem to version 1.5.2. (Jakub Jirutka)
   - Fix resolving of relative links to repository files in AsciiDoc documents. (Jakub Jirutka)
 
-v 7.11.0 (unreleased)
+v 7.11.1
+  - no changes
+
+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.
   - Fix broken view when viewing history of a file that includes a path that used to be another file (Stan Hu)
@@ -1437,4 +1440,4 @@ v 0.8.0
   - stability
   - security fixes
   - increased test coverage
-  - email notification
+  - email notification
\ No newline at end of file
-- 
GitLab