summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-08-18 08:45:41 +0000
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-08-18 08:45:41 +0000
commita12a8608e6160bef7f2edca1e20192b69a83ff54 (patch)
tree35f4c66753435ccdf26de8b2f6de13c9c3392c6e
parent136d3a02dca28273acf4d3e7243e449d7be110ce (diff)
parentbd2ba5b7c5d69e1536e265211b478ed46470e022 (diff)
downloadgitlab-ce-a12a8608e6160bef7f2edca1e20192b69a83ff54.tar.gz
Merge remote-tracking branch 'dev/13-2-stable' into 13-2-stable
-rw-r--r--CHANGELOG.md4
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--VERSION2
3 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9b2d98f20e..395ff400fae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 13.2.5 (2020-08-17)
+
+- No changes.
+
## 13.2.4 (2020-08-11)
### Security (1 change)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 0a84f132af3..8c339431c57 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-13.2.4
+13.2.5
diff --git a/VERSION b/VERSION
index 0a84f132af3..8c339431c57 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.2.4
+13.2.5