aboutsummaryrefslogtreecommitdiffstats
path: root/make/otp_subdir.mk
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-01-22 11:14:25 +0100
committerIngela Anderton Andin <[email protected]>2018-01-22 11:14:25 +0100
commit737ba8a823a557b5232bb7e00bb3930dd320785d (patch)
treeeb8d67c8aafc5005391d535429b966e826a7e7a9 /make/otp_subdir.mk
parentbb64f19a947568a56f719d609fa5915f703a32fb (diff)
parent3390468cee84f50b8b553e678608efce6da145ce (diff)
downloadotp-737ba8a823a557b5232bb7e00bb3930dd320785d.tar.gz
otp-737ba8a823a557b5232bb7e00bb3930dd320785d.tar.bz2
otp-737ba8a823a557b5232bb7e00bb3930dd320785d.zip
Merge branch 'ingela/ssl/no-chacha-default-for-now/ERL-538/OTP-14882'
* ingela/ssl/no-chacha-default-for-now/ERL-538/OTP-14882: ssl: Remove chacha ciphers form default for now
Diffstat (limited to 'make/otp_subdir.mk')
0 files changed, 0 insertions, 0 deletions