aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2016-03-10 13:10:32 +0100
committerErlang/OTP <[email protected]>2016-03-10 13:10:32 +0100
commitd5ea95b5bc1d334ecac312da7e8d92ee1e81377a (patch)
tree8be835cd4b0564e7787a2b3cb8913b5fea044457 /.mailmap
parent05cef5e3a267b3515acb834130675e0cbf69bf78 (diff)
parent2c7cee6ae55fbcb8e5f84caa3920420506c3a317 (diff)
downloadotp-d5ea95b5bc1d334ecac312da7e8d92ee1e81377a.tar.gz
otp-d5ea95b5bc1d334ecac312da7e8d92ee1e81377a.tar.bz2
otp-d5ea95b5bc1d334ecac312da7e8d92ee1e81377a.zip
Merge branch 'keynslug/fix_instant_hibernate_after' into maint-17
* keynslug/fix_instant_hibernate_after: ssl: fix hibernate_after with short timeouts
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions