diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-05-07 13:40:19 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-05-07 13:40:19 -0700 |
| commit | ec2460fb3c00648d0a161bcd5db34ca4777d2a6a (patch) | |
| tree | 77503083f58a9ad2b86f455ca700affcc0c98909 /sites/www | |
| parent | e6f9f03b086a0be71aa8bd84e480644d070b8f91 (diff) | |
| parent | c0667e1e6a1dd9b6cf2e47762b51d085417eb7c8 (diff) | |
Merge branch '1.11' into 1.12
Conflicts:
paramiko/__init__.py
setup.py
Diffstat (limited to 'sites/www')
| -rw-r--r-- | sites/www/changelog.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 443d18f4..3f8fbdc7 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,7 @@ Changelog ========= +* :release:`1.11.6 <2014-05-07>` * :bug:`-` Added self.args for exception classes. Used for unpickling. Related to (`Fabric #986 <https://github.com/fabric/fabric/issues/986>`_, `Fabric #714 <https://github.com/fabric/fabric/issues/714>`_). Thanks to Alex |