summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-01-30 14:32:26 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-01-30 14:32:26 -0800
commit04d1580962c4ff282ca770e1293a37100567c57e (patch)
treebbe01f551cd1638f9ae78b8969d493a224caa89b
parent7b059ea55d235a6c296bef71fedb5d294f425ac6 (diff)
parent792cfe0cf65b1ad45cea36e76c3be3d7535c47d7 (diff)
Merge branch '1.12'
-rw-r--r--sites/www/changelog.rst3
1 files changed, 0 insertions, 3 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 9df85c4b..1b4684ac 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,9 +2,6 @@
Changelog
=========
-* :release:`1.12.2 <2014-01-21>`
-* :release:`1.11.4 <2014-01-21>` 193
-* :release:`1.10.6 <2014-01-21>` 193
* :bug:`193` (and its attentant PRs :issue:`230` & :issue:`253`): Fix SSH agent
problems present on Windows. Thanks to David Hobbs for initial report and to
Aarni Koskela & Olle Lundberg for the patches.