diff options
| author | Chris McDonough <chrism@plope.com> | 2017-02-17 20:38:40 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2017-02-17 20:38:40 -0500 |
| commit | b2e8884a94d9e869bf29ea55298ad308f16ed420 (patch) | |
| tree | e46bf79d1a8811ad273a40ce194d05836fcc7409 /contributing.md | |
| parent | 7bb06f28ee296ecf43ba63279fc4c2439b4571d3 (diff) | |
| parent | 40d71e805bfcf8522c6af71995c05c496f1c4b4f (diff) | |
| download | pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.tar.gz pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.tar.bz2 pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'contributing.md')
| -rw-r--r-- | contributing.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contributing.md b/contributing.md index b5f17ae06..9deeee035 100644 --- a/contributing.md +++ b/contributing.md @@ -26,9 +26,9 @@ listed below. * [master](https://github.com/Pylons/pyramid/) - The branch on which further development takes place. The default branch on GitHub. -* [1.7-branch](https://github.com/Pylons/pyramid/tree/1.7-branch) - The branch +* [1.8-branch](https://github.com/Pylons/pyramid/tree/1.8-branch) - The branch classified as "stable" or "latest". -* [1.6-branch](https://github.com/Pylons/pyramid/tree/1.6-branch) - The oldest +* [1.7-branch](https://github.com/Pylons/pyramid/tree/1.7-branch) - The oldest actively maintained and stable branch. Older branches are not actively maintained. In general, two stable branches and |