aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src/socket_usage.xml
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2019-07-03 10:31:58 +0200
committerJohn Högberg <[email protected]>2019-07-03 10:31:58 +0200
commitb0a8268780f3f24cbfd9698a0ca08d166bbbd798 (patch)
tree671df9369e24377b40b80145f37564209e05d2d1 /erts/doc/src/socket_usage.xml
parent9e49cf35723d7436dbd0ec2f3c8da165b6eb906a (diff)
parent7999631c63998cffc07bbcc91dd86cbe709dde5f (diff)
downloadotp-b0a8268780f3f24cbfd9698a0ca08d166bbbd798.tar.gz
otp-b0a8268780f3f24cbfd9698a0ca08d166bbbd798.tar.bz2
otp-b0a8268780f3f24cbfd9698a0ca08d166bbbd798.zip
Merge branch 'maint-22' into maint
* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
Diffstat (limited to 'erts/doc/src/socket_usage.xml')
0 files changed, 0 insertions, 0 deletions