summaryrefslogtreecommitdiff
path: root/docs/whatsnew-1.2.rst
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2016-01-03 02:09:59 -0700
committerBert JW Regeer <bertjw@regeer.org>2016-01-03 02:09:59 -0700
commita2dff0592714d9cde5a0a612411aa96ce9d94b3c (patch)
tree6dac581990ba758670a8424cafe8bf31888471f7 /docs/whatsnew-1.2.rst
parent29e1002a108d045e1f80be3137f2cde4e47ca642 (diff)
parent5558386fd1a6181b2e8ad06659049c055a7ed023 (diff)
downloadpyramid-a2dff0592714d9cde5a0a612411aa96ce9d94b3c.tar.gz
pyramid-a2dff0592714d9cde5a0a612411aa96ce9d94b3c.tar.bz2
pyramid-a2dff0592714d9cde5a0a612411aa96ce9d94b3c.zip
Merge branch 'master' into feature/alchemy-scaffold-update
Diffstat (limited to 'docs/whatsnew-1.2.rst')
-rw-r--r--docs/whatsnew-1.2.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/whatsnew-1.2.rst b/docs/whatsnew-1.2.rst
index a9fc38908..9ff933ace 100644
--- a/docs/whatsnew-1.2.rst
+++ b/docs/whatsnew-1.2.rst
@@ -1,4 +1,4 @@
-What's New In Pyramid 1.2
+What's New in Pyramid 1.2
=========================
This article explains the new features in :app:`Pyramid` version 1.2 as