diff options
| author | Michael Merickel <michael@merickel.org> | 2016-03-21 23:34:26 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-03-21 23:34:26 -0500 |
| commit | 5238bb64abfebc085ca95df517535f61e27b7fc2 (patch) | |
| tree | c4eb14e487f561d4c12824b0b03656e24efccfd1 /contributing.md | |
| parent | 0b0f7e1a6d411bcc2af615da8e9dec7ea7519152 (diff) | |
| parent | 530bad618c33d65ad071b0280ce56eb265195805 (diff) | |
| download | pyramid-5238bb64abfebc085ca95df517535f61e27b7fc2.tar.gz pyramid-5238bb64abfebc085ca95df517535f61e27b7fc2.tar.bz2 pyramid-5238bb64abfebc085ca95df517535f61e27b7fc2.zip | |
Merge branch 'master' into feature/configurable-view-deriver
Diffstat (limited to 'contributing.md')
| -rw-r--r-- | contributing.md | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/contributing.md b/contributing.md index c2d2ecefd..af19ed093 100644 --- a/contributing.md +++ b/contributing.md @@ -27,11 +27,8 @@ listed below. * [master](https://github.com/Pylons/pyramid/) - The branch on which further development takes place. The default branch on GitHub. * [1.6-branch](https://github.com/Pylons/pyramid/tree/1.6-branch) - The branch -to which further development on master should be backported. This is also a -development branch. -* [1.5-branch](https://github.com/Pylons/pyramid/tree/1.5-branch) - The branch -classified as "stable" or "latest". Actively maintained. -* [1.4-branch](https://github.com/Pylons/pyramid/tree/1.4-branch) - The oldest +classified as "stable" or "latest". Actively maintained. +* [1.5-branch](https://github.com/Pylons/pyramid/tree/1.5-branch) - The oldest actively maintained and stable branch. Older branches are not actively maintained. In general, two stable branches and |