aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-11-09 15:33:58 +0100
committerIngela Anderton Andin <[email protected]>2016-11-09 15:33:58 +0100
commitbbdba69b905f87d95257a65d902fc09c25f0be4a (patch)
treec2d5aea5ba14f7a9120f20cebfcb6f4511a5bb72 /.mailmap
parent2bc52f6dd31d114b1a2d3cb7ad0a12b0b209beff (diff)
parent35ccc685984fc435a49e4a8b0228136b47a5095a (diff)
downloadotp-bbdba69b905f87d95257a65d902fc09c25f0be4a.tar.gz
otp-bbdba69b905f87d95257a65d902fc09c25f0be4a.tar.bz2
otp-bbdba69b905f87d95257a65d902fc09c25f0be4a.zip
Merge branch 'ingela/ssl/tune-timeouts-packet_SUITE' into maint
* ingela/ssl/tune-timeouts-packet_SUITE: ssl: Change to more modest timeouts
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions