diff options
author | Ingela Anderton Andin <[email protected]> | 2018-03-05 10:40:40 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2018-03-05 10:40:40 +0100 |
commit | 48ac9a112097cc3d42c399112c608fcf69dc2558 (patch) | |
tree | f93af5e89146130acd159f2a6d2ad88f3d97986b /prebuild.delete | |
parent | 075baa1d95f225b60b9d9d53592cdfaecf81c24f (diff) | |
parent | 174062a2d90e98fe15927b1483ee760e0ec02022 (diff) | |
download | otp-48ac9a112097cc3d42c399112c608fcf69dc2558.tar.gz otp-48ac9a112097cc3d42c399112c608fcf69dc2558.tar.bz2 otp-48ac9a112097cc3d42c399112c608fcf69dc2558.zip |
Merge branch 'ingela/ssl/AEAD-handling/ERL-568' into maint
* ingela/ssl/AEAD-handling/ERL-568:
ssl: Correct AEAD handling
Diffstat (limited to 'prebuild.delete')
0 files changed, 0 insertions, 0 deletions