aboutsummaryrefslogtreecommitdiffstats
path: root/lib/megaco
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2019-06-10 08:29:20 +0200
committerHans Nilsson <[email protected]>2019-06-10 08:29:20 +0200
commitf422241a1a2be4a69041e5fce35a18fcddd75e83 (patch)
treedd01f4753c9127c357e65c2acb1be3b88b3625f4 /lib/megaco
parent639ca4526b3f378bd1635fbc56f134d9c01e624b (diff)
parent508ddd5aaa189ddcf7a06f4342c187b07ec1734a (diff)
parent5160870a868bfcb29bd8f1a2c12b7b7b7963d946 (diff)
downloadotp-f422241a1a2be4a69041e5fce35a18fcddd75e83.tar.gz
otp-f422241a1a2be4a69041e5fce35a18fcddd75e83.tar.bz2
otp-f422241a1a2be4a69041e5fce35a18fcddd75e83.zip
Testing two PRs
Merge commit '508ddd5aaa189ddcf7a06f4342c187b07ec1734a'; commit '5160870a868bfcb29bd8f1a2c12b7b7b7963d946' into hans/ssh/PRs * commit '508ddd5aaa189ddcf7a06f4342c187b07ec1734a': Remove duplication of SSH encoding macros * commit '5160870a868bfcb29bd8f1a2c12b7b7b7963d946': Remove duplicate ssh_userauth.hrl