summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2016-04-16 10:04:10 +0000
committerValery Sizov <valery@gitlab.com>2016-04-16 10:04:10 +0000
commit63539a7a7e12a2191058095470638ccabc0a30a3 (patch)
tree85254e08c0e471a5e2cf77ff4442518bce69877d
parent8c9cc6d26c2936b6f759979fa959fdca88e282a7 (diff)
parentd744a04a5b4b46d970cf3c6c4030fc61718c59c0 (diff)
downloadgitlab-ce-63539a7a7e12a2191058095470638ccabc0a30a3.tar.gz
Merge branch 'changelog_typo' into 'master'
Fix TYPO in the changelog See merge request !3765
-rw-r--r--CHANGELOG2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c948e8e5460..f1320b6a28c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -72,7 +72,7 @@ v 8.7.0 (unreleased)
- Delete tags using Rugged for performance reasons (Robert Schilling)
- Diffs load at the correct point when linking from from number
- Selected diff rows highlight
- - Fix emoji catgories in the emoji picker
+ - Fix emoji categories in the emoji picker
- Add encrypted credentials for imported projects and migrate old ones
v 8.6.6