diff options
author | Bruce Yinhe <[email protected]> | 2014-10-22 16:16:01 +0200 |
---|---|---|
committer | Bruce Yinhe <[email protected]> | 2014-10-22 16:16:01 +0200 |
commit | 8462e28e5328efe2d8d739756d0f45af2fb1ab15 (patch) | |
tree | 9471e642d73e0a460924590f77b3ed154642952b /.mailmap | |
parent | 8304aeb0114e61e8f694a58cf9e91a00856c3fe5 (diff) | |
parent | be95772ee1fcfe71045ef070130bea7a910b81e3 (diff) | |
download | otp-8462e28e5328efe2d8d739756d0f45af2fb1ab15.tar.gz otp-8462e28e5328efe2d8d739756d0f45af2fb1ab15.tar.bz2 otp-8462e28e5328efe2d8d739756d0f45af2fb1ab15.zip |
Merge branch 'vinsentru/inets_ftp_extension' into maint
OTP-12255
* vinsentru/inets_ftp_extension:
INETS FTP: EPSV and EPRT for IPv4 added
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions