diff options
author | Zandra Hird <[email protected]> | 2015-03-19 10:36:00 +0100 |
---|---|---|
committer | Zandra Hird <[email protected]> | 2015-03-19 10:36:17 +0100 |
commit | 2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce (patch) | |
tree | c66710aa5e4dc7c7ac86c40cd49b6d3d47046930 /erts/man | |
parent | 8f7756db0c1eec733e24d9fadef7c855981c6dc1 (diff) | |
parent | 7cf85926c11d38ce5ebd181f9f98185f359d64a3 (diff) | |
download | otp-2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce.tar.gz otp-2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce.tar.bz2 otp-2d002d3f12cdeea8d2cacc5fb1ee70997d7ca0ce.zip |
Merge branch 'essen/ssl-alpn'
* essen/ssl-alpn:
ssl: Add TLS-ALPN support
OTP-12580
Diffstat (limited to 'erts/man')
0 files changed, 0 insertions, 0 deletions