diff options
| author | Erlang/OTP <[email protected]> | 2016-04-01 20:18:49 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-04-01 20:18:49 +0200 |
| commit | 488f8b45695cacb3b3e1162ac132596f04d0e00d (patch) | |
| tree | c39125145da68bb80e325c92fd66ae09abbb2b25 /erts | |
| parent | 523e048754f5086a6cc4fd9a250e1b495fc5b9b8 (diff) | |
| parent | b9c0ace0ca8a7ef8f6abe3acaf479716f9ea0f62 (diff) | |
| download | otp-488f8b45695cacb3b3e1162ac132596f04d0e00d.tar.gz otp-488f8b45695cacb3b3e1162ac132596f04d0e00d.tar.bz2 otp-488f8b45695cacb3b3e1162ac132596f04d0e00d.zip | |
Merge branch 'ia/inets/bracket-option/OTP-13417' into maint-18
* ia/inets/bracket-option/OTP-13417:
inets: Prepare for release
inets: Mend ipv6_host_with_brackets option
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions