aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-06-01 09:20:02 +0200
committerIngela Anderton Andin <[email protected]>2016-06-01 09:20:02 +0200
commit4eca51173ff1f3404a00c8f52970acb12476b9bb (patch)
treebe1b82421fb651a235f982bd506cab37750bd9c1 /.gitattributes
parent196224d37f0e973444c20af3d90b2663e1e62da8 (diff)
parent2c406958fd5c3060e4b4b574a65fa1a2a8ad31bf (diff)
downloadotp-4eca51173ff1f3404a00c8f52970acb12476b9bb.tar.gz
otp-4eca51173ff1f3404a00c8f52970acb12476b9bb.tar.bz2
otp-4eca51173ff1f3404a00c8f52970acb12476b9bb.zip
Merge branch 'joedevivo/ssl/PR-1063/OTP-13635'
* joedevivo/ssl/PR-1063/OTP-13635: ssl:recv timeout() can be 0
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions