summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-09-12 12:59:59 +0000
committerStan Hu <stanhu@gmail.com>2018-09-12 12:59:59 +0000
commit35807fa052fed36228991a41b78a1ca09f4f0601 (patch)
tree271360ba5913728c33182c974b788a7474817989
parentffd55318b9e3a726fcceef4466fc1d8e6be98634 (diff)
parent71b6faa6a66c9ef8505f8a9a4687b737746a2847 (diff)
downloadgitlab-shell-35807fa052fed36228991a41b78a1ca09f4f0601.tar.gz
Merge branch '154-release-gitlab-shell-8-3-2' into 'master'
Release GitLab Shell v8.3.2 See merge request gitlab-org/gitlab-shell!243
-rw-r--r--CHANGELOG4
-rw-r--r--VERSION2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 2b544f5..7df31d8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+v8.3.2
+ - Ensure text/plain & text/html content types are handled !239
+ - Fix newlines not appearing between new log entries !242
+
v8.3.1
- No changes (version tag correction)
diff --git a/VERSION b/VERSION
index 56b6be4..9c78b76 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.3.1
+8.3.2