summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2015-06-03 14:34:15 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2015-06-03 14:34:15 +0200
commit15b1bb47ba219bfaa50509aacefd796f41a68537 (patch)
treefabd5cc9463414af1d489f777378eb63f8c7305f
parente57b27d44f1eb7c83a8a96a2a7ec8159a55b1760 (diff)
parentc4161cd1470efe6bbf7952bd173912f2cf476008 (diff)
downloadgitlab-ce-15b1bb47ba219bfaa50509aacefd796f41a68537.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r--CHANGELOG2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 15fa8a37a0d..1a8012226a7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -61,7 +61,7 @@ v 7.11.0
- Get editing comments to work in Chrome 43 again.
- Allow special character in users bio. I.e.: I <3 GitLab
-v 7.11.0 (unreleased)
+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)