Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2016-09-10 11:04:52 -07:00
commit 222ad56285

View File

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