aboutsummaryrefslogtreecommitdiffstats
path: root/otp_build
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2016-05-03 10:10:54 +0200
committerErlang/OTP <[email protected]>2016-05-03 10:10:54 +0200
commit49d86a43c207f4825f7242f34a7cc8d3584993a7 (patch)
treee07c3cd02b9bf8181e9ad4d1c0deade2dff71376 /otp_build
parentf8ff2711258e4b30f9a984dfc27fd66cffe26b5f (diff)
parent7a3abea5ed893338e5691f87a782a0320e5ce270 (diff)
downloadotp-49d86a43c207f4825f7242f34a7cc8d3584993a7.tar.gz
otp-49d86a43c207f4825f7242f34a7cc8d3584993a7.tar.bz2
otp-49d86a43c207f4825f7242f34a7cc8d3584993a7.zip
Merge branch 'ingela/ssl/maint/algo-fixes/OTP-13525' into maint-18
* ingela/ssl/maint/algo-fixes/OTP-13525: ssl: Correct guard expression ssl: Correct cipher suites conversion
Diffstat (limited to 'otp_build')
0 files changed, 0 insertions, 0 deletions