dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '1.12' into 1.13 

Conflicts:
	paramiko/file.py
	paramiko/server.py
	paramiko/sftp_client.py
	sites/www/changelog.rst
This commit is contained in:
Jeff Forcier 2014-03-13 21:54:12 -07:00
parent e032541b78 a8ad23e61a
commit fe9171661a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sites/www/changelog.rst
View File

@ -2,6 +2,9 @@
Changelog Changelog
========= =========
* :bug:`235` Improve string type testing in a handful of spots (e.g. ``s/if
type(x) is str/if isinstance(x, basestring)/g``.) Thanks to ``@ksamuel`` for
the report.
* :release:`1.13.0 <2014-03-13>` * :release:`1.13.0 <2014-03-13>`
* :release:`1.12.3 <2014-03-13>` * :release:`1.12.3 <2014-03-13>`
* :release:`1.11.5 <2014-03-13>` * :release:`1.11.5 <2014-03-13>`