summaryrefslogtreecommitdiffhomepage
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
commitc859958924da10795a6460b5f040734bea394b03 (patch)
treeab948011f3c9b6028b39a9abe51551bbd64db24f
parent1c3a65ec924b14dddb593a6dedc12f88a7431126 (diff)
parent50ad483e6b1912e15f876689ea28ca6157d01b3a (diff)
Merge branch '1.14' into 1.15
-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 096b0ae7..2798891f 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.