aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-09-21 13:00:06 +0200
committerHans Nilsson <[email protected]>2018-09-21 13:00:06 +0200
commit64422fcac9c602641dcf24ef2d35e3491376304d (patch)
tree97df05999f90a6cefb69b8a5c7f799854a1a7537 /lib/ssh
parentd04b53936d5e9f84a3066ecd466993671b1428bf (diff)
parent299291fd3da85eff4a1f5d9a602d514c4ac9e6f6 (diff)
downloadotp-64422fcac9c602641dcf24ef2d35e3491376304d.tar.gz
otp-64422fcac9c602641dcf24ef2d35e3491376304d.tar.bz2
otp-64422fcac9c602641dcf24ef2d35e3491376304d.zip
Merge branch 'hans/crypto/fix_bad_merge' into maint
* hans/crypto/fix_bad_merge: crypto: Fix accidental merge
Diffstat (limited to 'lib/ssh')
0 files changed, 0 insertions, 0 deletions