aboutsummaryrefslogtreecommitdiffstats
path: root/otp_patch_apply
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-02-17 11:43:33 +0100
committerHans Nilsson <[email protected]>2017-02-17 11:43:33 +0100
commita4758f2e75d213bac6e66e7749d5e4d049b90deb (patch)
tree7f2b2b632e41c1cebd78a6886caab647d5323764 /otp_patch_apply
parentaf4855549d2a7b1cf414b0e6c0568c0e151e1319 (diff)
parent1ca3a090fb9027aa140fea06f57aa22f8790940a (diff)
downloadotp-a4758f2e75d213bac6e66e7749d5e4d049b90deb.tar.gz
otp-a4758f2e75d213bac6e66e7749d5e4d049b90deb.tar.bz2
otp-a4758f2e75d213bac6e66e7749d5e4d049b90deb.zip
Merge branch 'ssh_sftpd_relative_path' into hans/ssh/sftpd_fixes/OTP-14225
Conflicts: lib/ssh/test/ssh_sftpd_SUITE.erl
Diffstat (limited to 'otp_patch_apply')
0 files changed, 0 insertions, 0 deletions