diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-11-04 13:42:59 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-11-04 13:42:59 +0100 |
| commit | 90b1b181d4fb147dfb7403e910a057289bdd21b2 (patch) | |
| tree | a9d0d809d6d1d2041cf20e07f673d88680737111 /erts/.gitignore | |
| parent | c911744728926ee44a8dafd1ad44168dcc97201e (diff) | |
| parent | 1fd424859cfaebd371a08ab5977623dd20d28067 (diff) | |
| download | otp-90b1b181d4fb147dfb7403e910a057289bdd21b2.tar.gz otp-90b1b181d4fb147dfb7403e910a057289bdd21b2.tar.bz2 otp-90b1b181d4fb147dfb7403e910a057289bdd21b2.zip | |
Merge branch 'klyr/fix-ssl-npn-doc-2/OTP-11457' into maint
* klyr/fix-ssl-npn-doc-2/OTP-11457:
Fix client_preferred_next_protocols documentation
Diffstat (limited to 'erts/.gitignore')
0 files changed, 0 insertions, 0 deletions