diff options
author | Hans Nilsson <[email protected]> | 2018-04-20 11:53:39 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2018-04-20 11:53:39 +0200 |
commit | 38be1e447d1a64aa528ecae2d5e957d21e069019 (patch) | |
tree | 8e57a39c8773cfe7e3c13bf14bac09241b879656 /lib/ftp/test/property_test | |
parent | 21754c8d402855af5081dad0aff465a8f0f7eda7 (diff) | |
parent | 0343b68b053ee97b2ef70ea07b9aa87e8842c591 (diff) | |
download | otp-38be1e447d1a64aa528ecae2d5e957d21e069019.tar.gz otp-38be1e447d1a64aa528ecae2d5e957d21e069019.tar.bz2 otp-38be1e447d1a64aa528ecae2d5e957d21e069019.zip |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
inets: Fix broken httpc options handling
ssh: Fix server crashes for exit-normal signals
ssh: Fix ssh_sftpd:handle_op not returning State
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/ftp/test/property_test')
0 files changed, 0 insertions, 0 deletions