summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-12-09 10:44:30 -0800
committerJeff Forcier <jeff@bitprophet.org>2016-12-09 10:44:30 -0800
commitf742ce43d8e3d7cfaf9d5fe3ec8dce16070f7e8d (patch)
tree54a7ca144dad557677f0945de73b89057b061013 /sites
parent4fb0195e95c1edc125012f12474ffeaed109e410 (diff)
parent6dd47a677e0e919c4c10c3fed3a4173e9c49199c (diff)
Merge branch '1.18' into 2.0
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 7b2a8ffd..8589a777 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
Changelog
=========
+* :release:`1.18.0 <2016-12-09>`
+* :release:`1.17.3 <2016-12-09>`
* :bug:`802 (1.17+)` (via :issue:`804`) Update our vendored Windows API module
to address errors of the form ``AttributeError: 'module' object has no
attribute 'c_ssize_t'``. Credit to Jason R. Coombs.