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 /HACKING.txt | |
| 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 'HACKING.txt')
| -rw-r--r-- | HACKING.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/HACKING.txt b/HACKING.txt index f240492e7..bbebb5165 100644 --- a/HACKING.txt +++ b/HACKING.txt @@ -118,8 +118,8 @@ In order to add a feature to Pyramid: - The feature must be documented in both the API and narrative documentation (in ``docs/``). -- The feature must work fully on the following CPython versions: 2.7, 3.4, - and 3.5 on both UNIX and Windows. +- The feature must work fully on the following CPython versions: 2.7, 3.4, 3.5, + and 3.6 on both UNIX and Windows. - The feature must work on the latest version of PyPy. |