Merge branch '425-1-21-0-release' into 'master'v1.21.0

Release 1.21.0

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

2 files changed, 5 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 87f24f93..44d286e6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+v 1.21.0
+
+- Copy certs from SSL_CERT_DIR into chroot jail !291
+
 v 1.20.0
 
 - Enable continuous profiling !297
diff --git a/VERSION b/VERSION
index 39893559..3500250a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.20.0
+1.21.0