diff options
| author | Hans Nilsson <[email protected]> | 2017-02-17 11:43:33 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-02-17 11:43:33 +0100 |
| commit | a4758f2e75d213bac6e66e7749d5e4d049b90deb (patch) | |
| tree | 7f2b2b632e41c1cebd78a6886caab647d5323764 /lib/megaco/subdirs.mk | |
| parent | af4855549d2a7b1cf414b0e6c0568c0e151e1319 (diff) | |
| parent | 1ca3a090fb9027aa140fea06f57aa22f8790940a (diff) | |
| download | otp-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 'lib/megaco/subdirs.mk')
0 files changed, 0 insertions, 0 deletions