aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2016-06-13 13:21:23 +0200
committerErlang/OTP <[email protected]>2016-06-13 13:21:23 +0200
commit4d78ea9baba6c66be4696bca2ca32a0ae1443e77 (patch)
tree9b88d863f960c16563d7f0db80d8dd32632f735d /.mailmap
parent2d2155e81f9c02592b39145d9c2a7b836ebf1c91 (diff)
parentf6d9d94d022b61410c7b784ef95acbbcece65467 (diff)
downloadotp-4d78ea9baba6c66be4696bca2ca32a0ae1443e77.tar.gz
otp-4d78ea9baba6c66be4696bca2ca32a0ae1443e77.tar.bz2
otp-4d78ea9baba6c66be4696bca2ca32a0ae1443e77.zip
Merge branch 'joedevivo/maint/ssl/PR-1063/OTP-13635' into maint-18
* joedevivo/maint/ssl/PR-1063/OTP-13635: ssl:recv timeout() can be 0
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions