summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorBen Bangert <ben@groovie.org>2010-10-28 18:25:13 -0700
committerBen Bangert <ben@groovie.org>2010-10-28 18:25:13 -0700
commit6a9d6246c9e9fda507fa04b462c00509b73f676f (patch)
tree0b8cfaddb2585a2456031aafa3fc287b40e59fb3 /CHANGES.txt
parent6b49316f217a8fd72f8dac2abd7b7fcd8084e8bc (diff)
parenta62cc2264c2dda6a0588fddbc5712afea9d89837 (diff)
downloadpyramid-6a9d6246c9e9fda507fa04b462c00509b73f676f.tar.gz
pyramid-6a9d6246c9e9fda507fa04b462c00509b73f676f.tar.bz2
pyramid-6a9d6246c9e9fda507fa04b462c00509b73f676f.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 663db55fc..905bd27f1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,7 @@ Features (delta from BFG 1.3.X)
- Mako templating renderer supports resource specification format for
template lookups and within Mako templates. Absolute filenames must
- be used in Pyramid to avoid this lookup process..
+ be used in Pyramid to avoid this lookup process.
- Add ``pyramid.httpexceptions`` module, which is a facade for the
``webob.exc`` module.