summaryrefslogtreecommitdiff
path: root/docs/whatsnew-1.3.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-03-18 18:10:00 -0400
committerChris McDonough <chrism@plope.com>2012-03-18 18:10:00 -0400
commitac7d27dfb97bf887f8688264187db4a6c7be18ff (patch)
tree2953fd7844bebdc6b407d6cbfedd4194724b2fbc /docs/whatsnew-1.3.rst
parent811494584847b8108a462c28ce50f9cf30f0fb6b (diff)
parent2b41345e815c2e584fd51bbe534ba35e222f3b80 (diff)
downloadpyramid-ac7d27dfb97bf887f8688264187db4a6c7be18ff.tar.gz
pyramid-ac7d27dfb97bf887f8688264187db4a6c7be18ff.tar.bz2
pyramid-ac7d27dfb97bf887f8688264187db4a6c7be18ff.zip
Merge branch '1.3-branch'
Diffstat (limited to 'docs/whatsnew-1.3.rst')
-rw-r--r--docs/whatsnew-1.3.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst
index 85bb26ba5..b4138be13 100644
--- a/docs/whatsnew-1.3.rst
+++ b/docs/whatsnew-1.3.rst
@@ -15,6 +15,8 @@ The major feature additions in Pyramid 1.3 follow.
Python 3 Compatibility
~~~~~~~~~~~~~~~~~~~~~~
+.. image:: python-3.png
+
Pyramid continues to run on Python 2, but Pyramid is now also Python 3
compatible. To use Pyramid under Python 3, Python 3.2 or better is required.