aboutsummaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2016-06-14 10:21:38 +0200
committerHenrik Nord <[email protected]>2016-06-14 10:21:38 +0200
commit0c8357d15dd2573331056a308e3744927ce406ad (patch)
tree6b119202c4c879c797d7a792ae1dedab183a5d73 /AUTHORS
parent64515dcead288dacf4876eb0502c755f08427977 (diff)
parent53e7743216647d810d529e397bd3ea7278c6047c (diff)
downloadotp-0c8357d15dd2573331056a308e3744927ce406ad.tar.gz
otp-0c8357d15dd2573331056a308e3744927ce406ad.tar.bz2
otp-0c8357d15dd2573331056a308e3744927ce406ad.zip
Merge branch 'maint'
Conflicts: OTP_VERSION lib/inets/vsn.mk lib/ssl/test/ssl_basic_SUITE.erl lib/ssl/vsn.mk
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions