summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2022-02-11 05:33:20 +0000
committerIgor Drozdov <idrozdov@gitlab.com>2022-02-11 05:33:20 +0000
commit49e8423f04b5395b7401b0a295a5eaf19ca932e4 (patch)
treeec8238e07cfe5cec8d26e360f961ab78b69fd201
parentdf1d9b3fd3f10bea1d2f7d83dec06f05112ec94c (diff)
parent28dacc509a0f1ea4cfa88fe55623f98692e26827 (diff)
downloadgitlab-shell-49e8423f04b5395b7401b0a295a5eaf19ca932e4.tar.gz
Merge branch 'id-release-13-23-2' into 'main'v13.23.2
Release 13.23.2 See merge request gitlab-org/gitlab-shell!570
-rw-r--r--CHANGELOG7
-rw-r--r--VERSION2
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c9f1198..1bd7a01 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+v13.23.2
+
+- Bump labkit version to 1.12.0 !569
+- Add title and correct copyright notice to license !568
+- Bump go-proxyproto package !563
+- Update Go to version 1.17.6 !562
+
v13.23.1
- Replace golang.org/x/crypto with gitlab-org/golang-crypto !560
diff --git a/VERSION b/VERSION
index 60d99a6..bb13322 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.23.1
+13.23.2