summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-05-14 04:41:34 +0000
committerChris McDonough <chrism@agendaless.com>2009-05-14 04:41:34 +0000
commit0979f3d24acfa21217ad797d12fe2198d932d12d (patch)
tree61048f3bd8a3802ea8a8f13d938000b5a92f0a27
parentdbc6221246fcfa3768ce18580079af37c30a6698 (diff)
downloadpyramid-0979f3d24acfa21217ad797d12fe2198d932d12d.tar.gz
pyramid-0979f3d24acfa21217ad797d12fe2198d932d12d.tar.bz2
pyramid-0979f3d24acfa21217ad797d12fe2198d932d12d.zip
It was merged.
-rw-r--r--CHANGES.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 5a4c834b6..a30337ae1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -62,8 +62,7 @@ Bug Fixes
``Routes-1.11dev-chrism-home``. The source for the fork exists at
`http://bitbucket.org/chrism/routes-home/
<http://bitbucket.org/chrism/routes-home/>`_; its contents have been
- reported to the upstream Routes developers and will hopefully be a
- part of the final Routes 1.11 release.
+ merged into the Routes trunk (what will be Routes 1.11).
0.8a5 (2009-05-08)
==================