aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-09-07 09:43:05 +0200
committerIngela Anderton Andin <[email protected]>2016-09-07 09:43:05 +0200
commit61b1abd20322ad4f05eab7d53c333c6a1e91c296 (patch)
treed9f947c332c10bc5f822d1b44552da274b2dcc13 /.mailmap
parentdb0d3b200ed9b3ca0f63ecb1901c304a5560b035 (diff)
parent566773292d5e1a9dfdcfeda348b908c22952f9de (diff)
downloadotp-61b1abd20322ad4f05eab7d53c333c6a1e91c296.tar.gz
otp-61b1abd20322ad4f05eab7d53c333c6a1e91c296.tar.bz2
otp-61b1abd20322ad4f05eab7d53c333c6a1e91c296.zip
Merge branch 'ingela/ssl/ssl_basic_SUITE-timeouts' into maint
* ingela/ssl/ssl_basic_SUITE-timeouts: ssl: Tune timeout ssl: Consistent timeout handling
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions