aboutsummaryrefslogtreecommitdiffstats
path: root/OTP_VERSION
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-04-20 11:51:05 +0200
committerHans Nilsson <[email protected]>2018-04-20 11:51:05 +0200
commit0343b68b053ee97b2ef70ea07b9aa87e8842c591 (patch)
tree27e2f211cb8082896699873dce95fa71f2c3f8b7 /OTP_VERSION
parentf15f615f9185077b02c011ac28257e8365c01e75 (diff)
parentf2c1d537dc28ffbde5d42aedec70bf4c6574c3ea (diff)
downloadotp-0343b68b053ee97b2ef70ea07b9aa87e8842c591.tar.gz
otp-0343b68b053ee97b2ef70ea07b9aa87e8842c591.tar.bz2
otp-0343b68b053ee97b2ef70ea07b9aa87e8842c591.zip
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Prepare release erl_interface: Optimize latin1_to_utf8 and friend inets: Fix broken httpc options handling erl_interface: Fix ei_connect ssh: Fix server crashes for exit-normal signals ssh: Fix ssh_sftpd:handle_op not returning State ic: Optimize oe_ei_encode_atom
Diffstat (limited to 'OTP_VERSION')
-rw-r--r--OTP_VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/OTP_VERSION b/OTP_VERSION
index bbcf7fc16a..3338f72b5b 100644
--- a/OTP_VERSION
+++ b/OTP_VERSION
@@ -1 +1 @@
-20.3.3
+20.3.4