summaryrefslogtreecommitdiff
path: root/BFG_HISTORY.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-03-18 16:01:43 -0700
committerChris McDonough <chrism@plope.com>2013-03-18 16:01:43 -0700
commit881feb9c25b5c16d05e5ae9f3384eded1231fe59 (patch)
tree812ba136637b4b46655455b2a357d638ef505f10 /BFG_HISTORY.txt
parentc7a06f41d56d076dc979d800388c8befc1b8e5e5 (diff)
parentfc9dfbae2a76732ee8d027825fac28dbfd57e581 (diff)
downloadpyramid-881feb9c25b5c16d05e5ae9f3384eded1231fe59.tar.gz
pyramid-881feb9c25b5c16d05e5ae9f3384eded1231fe59.tar.bz2
pyramid-881feb9c25b5c16d05e5ae9f3384eded1231fe59.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'BFG_HISTORY.txt')
-rw-r--r--BFG_HISTORY.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/BFG_HISTORY.txt b/BFG_HISTORY.txt
index 10d926c70..8a2d40920 100644
--- a/BFG_HISTORY.txt
+++ b/BFG_HISTORY.txt
@@ -4611,8 +4611,9 @@ Bug Fixes
of the Routes trunk was put into the "dev" index named
``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
- merged into the Routes trunk (what will be Routes 1.11).
+ <http://bitbucket.org/chrism/routes-home/>`_ (broken link);
+ its contents have been merged into the Routes trunk
+ (what will be Routes 1.11).
0.8a5 (2009-05-08)
==================