aboutsummaryrefslogtreecommitdiffstats
path: root/OTP_VERSION
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-05-03 08:13:19 +0200
committerJohn Högberg <[email protected]>2018-05-03 08:13:19 +0200
commit26eea10dda1f316045e58e30a126feafe1843d3a (patch)
tree2908bab3b070a1e1c767c6fa038520f41834c6b8 /OTP_VERSION
parent0de7634ca20ff7d8dec143b92130cd04025557fc (diff)
parentb5b627ded69445c06e8fbe34cda3421854c5582e (diff)
downloadotp-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 'OTP_VERSION')
-rw-r--r--OTP_VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/OTP_VERSION b/OTP_VERSION
index 3338f72b5b..1092f91b35 100644
--- a/OTP_VERSION
+++ b/OTP_VERSION
@@ -1 +1 @@
-20.3.4
+20.3.5