diff options
author | John Högberg <[email protected]> | 2018-05-03 08:13:58 +0200 |
---|---|---|
committer | John Högberg <[email protected]> | 2018-05-03 08:13:58 +0200 |
commit | 7588c6f850c59ef2fa338b38ac1cf141af4f69f2 (patch) | |
tree | fb09c33a2e38eed82111a263b6ce595c67ef1b36 /erts/vsn.mk | |
parent | 6ab00dd854b70e0a4ad06fa802a5ebb1b4871721 (diff) | |
parent | 26eea10dda1f316045e58e30a126feafe1843d3a (diff) | |
download | otp-7588c6f850c59ef2fa338b38ac1cf141af4f69f2.tar.gz otp-7588c6f850c59ef2fa338b38ac1cf141af4f69f2.tar.bz2 otp-7588c6f850c59ef2fa338b38ac1cf141af4f69f2.zip |
Merge branch 'maint'
* maint:
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 |