summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-08-25 23:43:52 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-08-25 23:43:52 -0700
commit9cf96d459a75d6ef4df167d8b7aa62dfa90ef774 (patch)
tree9a2a9b9e7b56c3ceef365d2a93914445401d99a9 /sites
parent75be4122c5750c7f26ca0dc51c3b51c69264f3c4 (diff)
parentd7b93df7aaf9f409da7578a107829c138d042121 (diff)
Merge branch '1.14'
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index d2981f29..089ec30e 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
Changelog
=========
+* :release:`1.14.1 <2014-08-25>`
* :release:`1.13.2 <2014-08-25>`
* :bug:`376` Be less aggressive about expanding variables in ``ssh_config``
files, which results in a speedup of SSH config parsing. Credit to Olle