summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-03 23:05:43 -0400
committerChris McDonough <chrism@plope.com>2011-09-03 23:05:43 -0400
commit54190dd68e0307cae3d21e5f8920e9a5ea379771 (patch)
tree07f8f0339eef3678d0432a60cd0b44c8a2e43916 /CHANGES.txt
parent3e4f6932ebee2f4680c1a16e46e4b5cc792241a2 (diff)
parentc2aae1f09786f1044ded7c61a83961fed87cc7d9 (diff)
downloadpyramid-54190dd68e0307cae3d21e5f8920e9a5ea379771.tar.gz
pyramid-54190dd68e0307cae3d21e5f8920e9a5ea379771.tar.bz2
pyramid-54190dd68e0307cae3d21e5f8920e9a5ea379771.zip
merge master into branch
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index b1165cb37..9f2dc67ef 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,13 @@
+Next release
+============
+
+Bug Fixes
+---------
+
+- The ``route_prefix`` of a configurator was not properly taken into account
+ when registering routes in certain circumstances. See
+ https://github.com/Pylons/pyramid/issues/260
+
1.2a4 (2011-09-02)
==================