summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-10-29 01:55:58 -0400
committerChris McDonough <chrism@plope.com>2012-10-29 01:55:58 -0400
commit4fa68826e6d0980c6fd40b992c111f4496d202cf (patch)
tree9cfd4192d7a9b265da16856d9002471ed4f92e7f /CHANGES.txt
parent220435320613530bde80dd1c4a38a3e719f4af5d (diff)
parentc7337ba1b02915824cb33803993c8ba236ed23b9 (diff)
downloadpyramid-4fa68826e6d0980c6fd40b992c111f4496d202cf.tar.gz
pyramid-4fa68826e6d0980c6fd40b992c111f4496d202cf.tar.bz2
pyramid-4fa68826e6d0980c6fd40b992c111f4496d202cf.zip
Merge branch 'master' into 1.4-branch
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 1eec21fc2..740de0f17 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,11 @@
+Next release
+============
+
+Features
+--------
+
+- Added an ``effective_principals`` route and view predicate.
+
1.4a3 (2012-10-26)
==================