Merge branch 'master' into 'master'

Fix typo in CHANGELOG

Merge branch 'master' into 'master'
Fix typo in CHANGELOG
8e5a0b6e · Dmitriy Zaporozhets · 1687095d · 95b786ff · 8e5a0b6e
Commit 8e5a0b6e authored Jun 10, 2014 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

CHANGELOG CHANGELOG +2 -2

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