Merge branch '2.0'

This commit is contained in:
terrafrost 2016-09-10 11:16:52 -07:00
commit 03937a7933

View File

@ -101,9 +101,7 @@ class SCP
* *
* Connects to an SSH server * Connects to an SSH server
* *
* @param string $host * @param \phpseclib\Net\SSH1|\phpseclin\Net\SSH2 $ssh
* @param int $port
* @param int $timeout
* @return \phpseclib\Net\SCP * @return \phpseclib\Net\SCP
* @access public * @access public
*/ */