aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2019-07-30 16:43:36 +0200
committerMicael Karlberg <[email protected]>2019-07-30 16:43:36 +0200
commitd065c9b0a4ca53f73b9b586b40f6b5a4d2909a99 (patch)
treeb7c14e86e317b104089a4b3eac1081787aa4016a /.mailmap
parent478488a2e75e8e73b8dfc7b6f22fd1f0bfbc04eb (diff)
parentd48d2e6b914582df5fb589113fc4201c64806591 (diff)
downloadotp-d065c9b0a4ca53f73b9b586b40f6b5a4d2909a99.tar.gz
otp-d065c9b0a4ca53f73b9b586b40f6b5a4d2909a99.tar.bz2
otp-d065c9b0a4ca53f73b9b586b40f6b5a4d2909a99.zip
Merge branch 'bmk/erts/esock/20190717/socket_options/OTP-15904' into maint
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions