diff options
author | Ingela Anderton Andin <[email protected]> | 2014-01-21 15:26:57 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2014-01-21 15:26:57 +0100 |
commit | 8de45496ceacdad8bc01a137d180602b089a8d65 (patch) | |
tree | 6f88d290168a65977b11e80614057a69a43603fe /lib/toolbar/src/toolbar_lib.erl | |
parent | c0b39f22abf34f6a0fb233418a02b2e6f41875e3 (diff) | |
parent | caac6cb4f18750613460acd491da299bbe4a96cc (diff) | |
download | otp-8de45496ceacdad8bc01a137d180602b089a8d65.tar.gz otp-8de45496ceacdad8bc01a137d180602b089a8d65.tar.bz2 otp-8de45496ceacdad8bc01a137d180602b089a8d65.zip |
Merge branch 'ia/ssl/ECC-curve-selection/OTP-11575' into maint
* ia/ssl/ECC-curve-selection/OTP-11575:
ssl: Prepare for release
ssl: fix elliptic curve selection in server mode
Diffstat (limited to 'lib/toolbar/src/toolbar_lib.erl')
0 files changed, 0 insertions, 0 deletions