aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-10-08 14:58:34 +0200
committerIngela Anderton Andin <[email protected]>2018-10-08 14:58:34 +0200
commita6b3f3d2678a321a9bbddf15d0a130b9f89824f6 (patch)
tree7ad9e72373cad3972bfefacdbdc56c93f2714d68 /lib/inets
parent870f4f4518846243f1ac2b2aefe36aa92dc366a5 (diff)
parentf4c8e878fe335afd4b5036c6f1991ba671bfa8dc (diff)
downloadotp-a6b3f3d2678a321a9bbddf15d0a130b9f89824f6.tar.gz
otp-a6b3f3d2678a321a9bbddf15d0a130b9f89824f6.tar.bz2
otp-a6b3f3d2678a321a9bbddf15d0a130b9f89824f6.zip
Merge branch 'maint'
Conflicts: lib/ssl/src/ssl_connection.erl lib/ssl/src/tls_connection.erl
Diffstat (limited to 'lib/inets')
0 files changed, 0 insertions, 0 deletions