summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-13 16:37:30 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-13 16:37:30 +0000
commitae5c7ab85ad2bd9108a288adf74c45cffde92037 (patch)
tree427f089422cb6ab15d73ad2f4b4b916d47cc317a
parent410373087baa33a2a1eac0c318ef436bc069a40a (diff)
downloadgitlab-ce-ae5c7ab85ad2bd9108a288adf74c45cffde92037.tar.gz
Add latest changes from gitlab-org/security/gitlab@12-6-stable-ee
-rw-r--r--CHANGELOG-EE.md4
-rw-r--r--VERSION2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md
index 12caedf0c32..70b2e699918 100644
--- a/CHANGELOG-EE.md
+++ b/CHANGELOG-EE.md
@@ -1,5 +1,9 @@
Please view this file on the master branch, on stable branches it's out of date.
+## 12.6.4
+
+- No changes.
+
## 12.6.3
- No changes.
diff --git a/VERSION b/VERSION
index 6a642e0c923..c3ac67f45fe 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.6.4
+12.6.4-ee