aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-11-16 11:04:09 +0100
committerIngela Anderton Andin <[email protected]>2017-11-16 11:38:16 +0100
commitf1bee5747a39adde2e8bab666d19c99a0069f5a9 (patch)
tree4ef61b1d8f7247cea47344ee7ea17b26a7989608 /erts
parentd332dcea887f9f13726bb31c1b70ae7c4c98cade (diff)
parent70defe957f68f5ad4a4957af29c8713556074995 (diff)
downloadotp-f1bee5747a39adde2e8bab666d19c99a0069f5a9.tar.gz
otp-f1bee5747a39adde2e8bab666d19c99a0069f5a9.tar.bz2
otp-f1bee5747a39adde2e8bab666d19c99a0069f5a9.zip
Merge branch 'maint'
Conflicts: lib/ssl/src/dtls_connection.erl lib/ssl/src/ssl_connection.erl lib/ssl/src/ssl_handshake.erl lib/ssl/src/tls_connection.erl
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions