diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-03-13 21:36:48 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-03-13 21:36:48 -0700 |
| commit | 9695500303c15584faa55bec1492fe2577ec384d (patch) | |
| tree | 2de5ef27bbc49ab68e00cf42a4863ce4c78c3a9e | |
| parent | 1774a4b9c0f7776104f79ba931ccf54bcf6d93f7 (diff) | |
| parent | b94af130b590692c6cdc3312d3ff768e80ab077e (diff) | |
Merge branch '1.12' into 1.13
Conflicts:
sites/www/changelog.rst
| -rw-r--r-- | sites/www/changelog.rst | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 5cd718eb..f0a6cf0e 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,9 @@ Changelog ========= +* :release:`1.12.3 <2014-03-13>` +* :release:`1.11.5 <2014-03-13>` +* :release:`1.10.7 <2014-03-13>` * :feature:`16` **Python 3 support!** Our test suite passes under Python 3, and it (& Fabric's test suite) continues to pass under Python 2. |