Merge branch '2.0'

This commit is contained in:
terrafrost 2016-11-04 02:26:08 -05:00
commit 83a6f8b788

2
phpseclib/Net/SCP.php Normal file → Executable file
View File

@ -102,7 +102,7 @@ class SCP
* *
* Connects to an SSH server * Connects to an SSH server
* *
* @param \phpseclib\Net\SSH1|\phpseclin\Net\SSH2 $ssh * @param \phpseclib\Net\SSH1|\phpseclib\Net\SSH2 $ssh
* @return \phpseclib\Net\SCP * @return \phpseclib\Net\SCP
* @access public * @access public
*/ */