diff options
author | John Högberg <[email protected]> | 2018-05-03 08:13:19 +0200 |
---|---|---|
committer | John Högberg <[email protected]> | 2018-05-03 08:13:19 +0200 |
commit | 26eea10dda1f316045e58e30a126feafe1843d3a (patch) | |
tree | 2908bab3b070a1e1c767c6fa038520f41834c6b8 /erts/vsn.mk | |
parent | 0de7634ca20ff7d8dec143b92130cd04025557fc (diff) | |
parent | b5b627ded69445c06e8fbe34cda3421854c5582e (diff) | |
download | otp-26eea10dda1f316045e58e30a126feafe1843d3a.tar.gz otp-26eea10dda1f316045e58e30a126feafe1843d3a.tar.bz2 otp-26eea10dda1f316045e58e30a126feafe1843d3a.zip |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Update release notes
Update version numbers
ssl: Prepare for release
ssl: Proper handling of clients that choose to send an empty answer to a certificate request
heart: Use ntohs instead of manual conversion
Diffstat (limited to 'erts/vsn.mk')
-rw-r--r-- | erts/vsn.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/vsn.mk b/erts/vsn.mk index c3a62a5535..25acd9cc34 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 9.3 +VSN = 9.3.1 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |