diff options
| author | Michael Merickel <michael@merickel.org> | 2016-12-10 00:01:05 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-12-10 00:01:05 -0600 |
| commit | 1fde5f47b8b6208a25e951c6d3887cc73cc3696e (patch) | |
| tree | 1975f4d89d0422aaabd09b9bf94ac0da93534f8d /docs/narr/install.rst | |
| parent | ff0da73a8922b5e82c676715078c7b9e60a6a1da (diff) | |
| parent | 2d45def603f038a8533eb9790640982012c0be30 (diff) | |
| download | pyramid-1fde5f47b8b6208a25e951c6d3887cc73cc3696e.tar.gz pyramid-1fde5f47b8b6208a25e951c6d3887cc73cc3696e.tar.bz2 pyramid-1fde5f47b8b6208a25e951c6d3887cc73cc3696e.zip | |
Merge branch 'master' into pserve-watch-files
Diffstat (limited to 'docs/narr/install.rst')
| -rw-r--r-- | docs/narr/install.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/install.rst b/docs/narr/install.rst index 570cb2285..c3c2ba64c 100644 --- a/docs/narr/install.rst +++ b/docs/narr/install.rst @@ -22,7 +22,7 @@ the following sections. .. sidebar:: Python Versions As of this writing, :app:`Pyramid` is tested against Python 2.7, - Python 3.4, Python 3.5, PyPy. + Python 3.4, Python 3.5, Python 3.6, and PyPy. :app:`Pyramid` is known to run on all popular UNIX-like systems such as Linux, Mac OS X, and FreeBSD, as well as on Windows platforms. It is also known to |