diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-03-13 21:36:05 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-03-13 21:36:05 -0700 |
| commit | 005cfb8b251b79e5509e83c86f6ae4812aeebf7d (patch) | |
| tree | e04e22c595a3c2b3f908e83c76fe13bdc29d27d0 | |
| parent | bbd9469d65b93285a05388246ec45e9fc36ca732 (diff) | |
| parent | 4e9efe48306d885281af69559a8da2194741c139 (diff) | |
| download | paramiko-005cfb8b251b79e5509e83c86f6ae4812aeebf7d.tar.gz | |
Merge branch '1.11' into 1.12
Conflicts:
sites/www/changelog.rst
| -rw-r--r-- | sites/www/changelog.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 0c396c58..a2083a83 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -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. |