Merge branch 'changelog-6.0.0' into 'master'

Add changelog for 6.0.0 See merge request gitlab-org/gitlab-workhorse!291

Merge branch 'changelog-6.0.0' into 'master'
Add changelog for 6.0.0 See merge request gitlab-org/gitlab-workhorse!291
ef80978f · Nick Thomas · dbb94870 · 291f600d · ef80978f · ef80978f
Commit ef80978f authored Aug 15, 2018 by Nick Thomas
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

CHANGELOG CHANGELOG +4 -0

VERSION VERSION +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@

 Formerly known as 'gitlab-git-http-server'.

+v 6.0.0
+
+- Accelerate Maven artifact repository uploads !283
+
 v 5.2.0

 - Populate Git Protocol !276

--- a/VERSION
+++ b/VERSION
-5.2.0
+6.0.0