summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-09-10 13:25:15 +0000
committerStan Hu <stanhu@gmail.com>2018-09-10 13:25:15 +0000
commite5b6e8e2550e203978cd25d3e07ca468b4d06c91 (patch)
tree32fb34bb2a2329ee4cdf810713edd566e94505ff
parent4c7bc158db4bd267149605597ac710a80eb77c05 (diff)
parent7e60253029780e8478f25207a2eefe19179d0cc8 (diff)
downloadgitlab-shell-e5b6e8e2550e203978cd25d3e07ca468b4d06c91.tar.gz
Merge branch 'sh-release-8.3.1' into 'master'v8.3.1
Release 8.3.1 to fix version numbering See merge request gitlab-org/gitlab-shell!241
-rw-r--r--CHANGELOG3
-rw-r--r--VERSION2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 2c2cae6..2b544f5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v8.3.1
+ - No changes (version tag correction)
+
v8.3.0
- Add custom action (e.g. proxying SSH push) support
diff --git a/VERSION b/VERSION
index 2bf50aa..56b6be4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.3.0
+8.3.1