diff options
author | Fredrik Gustafsson <[email protected]> | 2013-03-19 12:01:21 +0100 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2013-03-19 12:01:21 +0100 |
commit | 487116a505a4346ea9e951a92fa17eea294bd177 (patch) | |
tree | e8434cb7fe51adc3d4bc51c5fbe4fff9f21de3cd /erts | |
parent | ab15d1c6ea041f1d4a8b5897f9f4ca7c4c4d86d0 (diff) | |
parent | 57ade3a03d5bc56abebd172ced05520cbe5185f7 (diff) | |
download | otp-487116a505a4346ea9e951a92fa17eea294bd177.tar.gz otp-487116a505a4346ea9e951a92fa17eea294bd177.tar.bz2 otp-487116a505a4346ea9e951a92fa17eea294bd177.zip |
Merge branch 'jb/ssl/fix-ssl-npn-doc/OTP-10955' into maint
* jb/ssl/fix-ssl-npn-doc/OTP-10955:
Fix SSL Next Protocol Negotiation documentation
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions