Merge branch 'master' of github.com:gitlabhq/gitlabhq

15b1bb47 · Jacob Vosmaer · e57b27d4 · c4161cd1 · 15b1bb47
Commit 15b1bb47 authored Jun 03, 2015 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

CHANGELOG CHANGELOG +1 -1

No files found.
--- 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)