summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Rosenögger <123haynes@gmail.com>2015-04-21 14:15:57 +0000
committerHannes Rosenögger <123haynes@gmail.com>2015-04-21 14:15:57 +0000
commitc8301914e87aa458acd58d9437b23d0ef551c58e (patch)
tree070d53f8a919a47895a61cde6a5ee7fc7b4047ea
parent6750e2d53f2e2a4cb15bbc159f29cf4c55e5db4b (diff)
parentbf813a22a1843f9ce2156a5d87487956049d8ae4 (diff)
downloadgitlab-ce-c8301914e87aa458acd58d9437b23d0ef551c58e.tar.gz
Merge branch 'fix-duplicate-changelog-entry' into 'master'
Remove entry that was shipped in v7.9.1 See merge request !532
-rw-r--r--CHANGELOG1
1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d872b12df9a..55081988071 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,7 +38,6 @@ v 7.10.0 (unreleased)
- Allow HTML tags in Markdown input
- Fix code unfold not working on Compare commits page (Stan Hu)
- Fix generating SSH key fingerprints with OpenSSH 6.8. (Sašo Stanovnik)
- - Include missing events and fix save functionality in admin service template settings form (Stan Hu)
- Fix "Import projects from" button to show the correct instructions (Stan Hu)
- Fix dots in Wiki slugs causing errors (Stan Hu)
- Make maximum attachment size configurable via Application Settings (Stan Hu)