diff options
| author | cewing <cris@crisewing.com> | 2017-05-22 12:09:41 -0700 |
|---|---|---|
| committer | cewing <cris@crisewing.com> | 2017-05-22 12:09:41 -0700 |
| commit | b033b966420b673bf0222c3576d3238773433d0f (patch) | |
| tree | ba5d63e118ba5ebbad901b5c1558adff04224686 /contributing.md | |
| parent | 7c680930d09d20bfa05249e01553e6488e61f1ca (diff) | |
| parent | 8c4d422965b633f31967ceed1e6cc25cc616d0bf (diff) | |
| download | pyramid-b033b966420b673bf0222c3576d3238773433d0f.tar.gz pyramid-b033b966420b673bf0222c3576d3238773433d0f.tar.bz2 pyramid-b033b966420b673bf0222c3576d3238773433d0f.zip | |
Merge branch 'master' into issue.2614
Diffstat (limited to 'contributing.md')
| -rw-r--r-- | contributing.md | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contributing.md b/contributing.md index b5f17ae06..82f60e7b8 100644 --- a/contributing.md +++ b/contributing.md @@ -26,9 +26,11 @@ 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.9-branch](https://github.com/Pylons/pyramid/tree/1.9-branch) - The branch + classified as "alpha". +* [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 |