diff options
| author | Hans Nilsson <[email protected]> | 2018-04-20 11:51:05 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-04-20 11:51:05 +0200 |
| commit | 0343b68b053ee97b2ef70ea07b9aa87e8842c591 (patch) | |
| tree | 27e2f211cb8082896699873dce95fa71f2c3f8b7 /erts | |
| parent | f15f615f9185077b02c011ac28257e8365c01e75 (diff) | |
| parent | f2c1d537dc28ffbde5d42aedec70bf4c6574c3ea (diff) | |
| download | otp-0343b68b053ee97b2ef70ea07b9aa87e8842c591.tar.gz otp-0343b68b053ee97b2ef70ea07b9aa87e8842c591.tar.bz2 otp-0343b68b053ee97b2ef70ea07b9aa87e8842c591.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Prepare release
erl_interface: Optimize latin1_to_utf8 and friend
inets: Fix broken httpc options handling
erl_interface: Fix ei_connect
ssh: Fix server crashes for exit-normal signals
ssh: Fix ssh_sftpd:handle_op not returning State
ic: Optimize oe_ei_encode_atom
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions