Merge branch 'release-1-3-0' into 'master'v1.3.0

Release v1.3.0

See merge request gitlab-org/gitlab-pages!119

2 files changed, 6 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 96ca259a..cb69cb8f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+v 1.3.0
+- Allow the maximum connection concurrency to be set !117
+- Update Prometheus vendoring to v0.9 !116
+- Fix version string not showing properly !115
+
 v 1.2.1
 -  Fix 404 for project with capital letters !114
 
diff --git a/VERSION b/VERSION
index 6085e946..f0bb29e7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.1
+1.3.0