summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-15 19:08:28 -0500
committerChris McDonough <chrism@plope.com>2011-01-15 19:08:28 -0500
commit2c4cd00d071d53efc560fb38f63d7db4a162e13b (patch)
treed9aed9f00f4a11ececd692f71daca9f20b5239fb /CHANGES.txt
parentf2681ae753b9cc94f88b4cf47fa44714ff20216a (diff)
parent3d0d55e3f04810f4da83f4b794eb30f605f86d0e (diff)
downloadpyramid-2c4cd00d071d53efc560fb38f63d7db4a162e13b.tar.gz
pyramid-2c4cd00d071d53efc560fb38f63d7db4a162e13b.tar.bz2
pyramid-2c4cd00d071d53efc560fb38f63d7db4a162e13b.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index d8853593b..fc1a53dd7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,12 @@
Next release
============
+Bug Fixes
+---------
+
+- URL Dispatch properly handles a '.*' or '*' appearing in a regex match
+ when used inside brackets. Resolve Issue #90.
+
Features
--------