summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-10 09:51:45 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-10 09:51:45 +0000
commit8e5a0b6e92b3439e2a7fb20456f238c39dcc590d (patch)
treeabfecc0f9b959c336ee866d5ac2989a04ec0c570
parent1687095db6210adc82a0b250541742179b188a88 (diff)
parent95b786ff79e4fd2320f4776e87dc498088d00cf6 (diff)
downloadgitlab-ce-8e5a0b6e92b3439e2a7fb20456f238c39dcc590d.tar.gz
Merge branch 'master' into 'master'
Fix typo in CHANGELOG
-rw-r--r--CHANGELOG4
1 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ce394e1f1a6..900c7a11031 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,7 +20,7 @@ v 7.0.0
- Improve performance of application for projects and groups with a lot of members
- Formally support Ruby 2.1
- Include Nginx gitlab-ssl config
- - Add manual language detection foir highlight.js
+ - Add manual language detection for highlight.js
- Added example.com/:username routing
- Show notice if your profile is public
- UI improvements for mobile devices
@@ -790,4 +790,4 @@ v 0.8.0
- stability
- security fixes
- increased test coverage
- - email notification
+ - email notification \ No newline at end of file