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

Merge branch '1.11' into 1.12 

Conflicts:
	sites/www/changelog.rst
This commit is contained in:
Jeff Forcier 2014-03-13 21:36:05 -07:00
parent bbd9469d65 4e9efe4830
commit 005cfb8b25
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sites/www/changelog.rst
View File

@ -2,6 +2,8 @@
Changelog
=========
* :release:`1.11.5 <2014-03-13>`
* :release:`1.10.7 <2014-03-13>`
* :support:`256 backported` Convert API documentation to Sphinx, yielding a new
API docs website to replace the old Epydoc one. Thanks to Olle Lundberg for
the initial conversion work.