diff options
author | Rickard Green <[email protected]> | 2017-05-10 17:02:00 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2017-05-10 17:02:00 +0200 |
commit | 0066f7e19efc89214724a20b3a1f3b181518fd9b (patch) | |
tree | d4e339eb2cbc832a81d36ff0cef9bcaba4f53704 /erts | |
parent | 37decbb64953cd65bde2f7003ef5057dc0615ff1 (diff) | |
parent | 92efc13921a0759ea785ab0cea95888b76b9bb4d (diff) | |
download | otp-0066f7e19efc89214724a20b3a1f3b181518fd9b.tar.gz otp-0066f7e19efc89214724a20b3a1f3b181518fd9b.tar.bz2 otp-0066f7e19efc89214724a20b3a1f3b181518fd9b.zip |
Merge branch 'maint-18' into maint
* maint-18:
Updated OTP version
Update release notes
inets: Prepare for release
inets: Mend ipv6_host_with_brackets option
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions