summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2016-12-05 20:10:02 -0800
committerJeff Forcier <jeff@bitprophet.org>2016-12-05 20:10:02 -0800
commit748772e1f1e853466404978cf1269f6dd79b7fcb (patch)
tree6eeb39fcf96e5e9a63664d0ecc7bb00f4fc7c8f0 /sites
parent1d3ce6de95ac602a1a27d9a09b5de557bee07abf (diff)
parent1a03c7df54611500b2e91fa7eee7a8b74b62c737 (diff)
Merge branch '1.17' into 1.18
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 9a37c7b2..0ceca078 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
Changelog
=========
+* :support:`801 (1.17+)` Skip a Unix-only test when on Windows; thanks to
+ Gabi Davar.
* :support:`792 (1.17+)` Minor updates to the README and demos; thanks to Alan
Yee.
* :feature:`780 (1.18+)` (also :issue:`779`, and may help users affected by