summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2015-12-10 18:19:27 -0800
committerJeff Forcier <jeff@bitprophet.org>2015-12-10 18:19:27 -0800
commit50ad483e6b1912e15f876689ea28ca6157d01b3a (patch)
tree2a5f1d766f1f1248ef305e7106f77bb1a82a095d /sites/www
parentcca01ba45b462b5aff21dfd3510b893e9f9eab11 (diff)
parent8ca9a1d56447a4b42d5847161c3214ffa17cbfe6 (diff)
Merge branch '1.13' into 1.14
Diffstat (limited to 'sites/www')
-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 c1705755..1926ab17 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
Changelog
=========
+* :support:`636` Clean up and enhance the README (and rename it to
+ ``README.rst`` from just ``README``). Thanks to ``@LucasRMehl``.
* :bug:`401` Fix line number reporting in log output regarding invalid
``known_hosts`` line entries. Thanks to Dylan Thacker-Smith for catch &
patch.