aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-05-10 17:05:49 +0200
committerRickard Green <[email protected]>2017-05-10 17:05:49 +0200
commit2a9cbec0ec4bc6e114d63c8543886d36bd0eb2df (patch)
tree0c9d9a5b20e54da38902527064e1622720b43553 /erts/doc
parent6b278ecbc1384f338b6ac8accec37fc72bf538f2 (diff)
parent0066f7e19efc89214724a20b3a1f3b181518fd9b (diff)
downloadotp-2a9cbec0ec4bc6e114d63c8543886d36bd0eb2df.tar.gz
otp-2a9cbec0ec4bc6e114d63c8543886d36bd0eb2df.tar.bz2
otp-2a9cbec0ec4bc6e114d63c8543886d36bd0eb2df.zip
Merge branch 'maint'
* maint: Updated OTP version Update release notes inets: Prepare for release inets: Mend ipv6_host_with_brackets option
Diffstat (limited to 'erts/doc')
0 files changed, 0 insertions, 0 deletions