Merge branch 'patch-4' into 'master'

clarify changelog entry on GitHub Enterprise import support /cc @stanhu See merge request !4066

Merge branch 'patch-4' into 'master'
1070e0a8 · Stan Hu · 00acdcf7 · b8b54252 · 1070e0a8
Commit 1070e0a8 authored May 06, 2016 by Stan Hu
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
@@ -18,7 +18,7 @@ v 8.8.0 (unreleased)
  - Display informative message when new milestone is created
  - Allow "NEWS" and "CHANGES" as alternative names for CHANGELOG. !3768 (Connor Shea)
  - Added button to toggle whitespaces changes on diff view
-  - Backport GitLab Enterprise support from EE
+  - Backport GitHub Enterprise import support from EE
  - Create tags using Rugged for performance reasons. !3745
  - Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718
  - Add support for supressing text diffs using .gitattributes on the default branch (Matt Oakes)