summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-09-14 13:02:42 +0000
committerStan Hu <stanhu@gmail.com>2018-09-14 13:02:42 +0000
commitdd54651b987c473fc42ae6c81daf0a47a92f9dca (patch)
treeaff463e0cedb95f8047235c96c8f6fead590ac98
parent3cd6939527525f8d191bc0ae519059b4e3a492ad (diff)
parent4b19de3a1897d06c3e0d530f679c6f56e250ca41 (diff)
downloadgitlab-shell-dd54651b987c473fc42ae6c81daf0a47a92f9dca.tar.gz
Merge branch '155-merge-8-3-3-into-master' into 'master'
Merge 8-3-stable branch changes into master Closes #155 See merge request gitlab-org/gitlab-shell!245
-rw-r--r--CHANGELOG3
-rw-r--r--VERSION2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7df31d8..165f56a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v8.3.3
+ - Release v8.3.3 as v8.3.2 tag is incorrect
+
v8.3.2
- Ensure text/plain & text/html content types are handled !239
- Fix newlines not appearing between new log entries !242
diff --git a/VERSION b/VERSION
index 9c78b76..d127a0f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.3.2
+8.3.3