Merge branch 'release-2.1.1' into 'master'

Release v2.1.1 Closes #135 See merge request !170

Merge branch 'release-2.1.1' into 'master'
Release v2.1.1 Closes #135 See merge request !170
e36227d8 · Nick Thomas · 9a5eed65 · 3a297689 · e36227d8 · e36227d8
Commit e36227d8 authored Jun 09, 2017 by Nick Thomas
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

CHANGELOG CHANGELOG +3 -0

VERSION VERSION +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Formerly known as 'gitlab-git-http-server'.
+v2.1.1
+- Bug fix and counters for static error pages
 v2.1.0
 - Remove chatty ErrorPage log message
 - Filter query-string secrets out of logged URLs

--- a/VERSION
+++ b/VERSION
-2.1.0
+2.1.1