diff options
| author | Chris McDonough <chrism@plope.com> | 2016-06-01 17:13:27 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2016-06-01 17:13:27 -0400 |
| commit | 3e9a737500e79a6a919ce53db9557c75d874b84c (patch) | |
| tree | ef674c176ab29b9dede8a8fa70c3a18a26edde44 /contributing.md | |
| parent | b5f065906f75efdcc9f80d4f0b8b4092e92b41c0 (diff) | |
| parent | 382f93e2bfec5563587e306fda3fd34759314300 (diff) | |
| download | pyramid-3e9a737500e79a6a919ce53db9557c75d874b84c.tar.gz pyramid-3e9a737500e79a6a919ce53db9557c75d874b84c.tar.bz2 pyramid-3e9a737500e79a6a919ce53db9557c75d874b84c.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'contributing.md')
| -rw-r--r-- | contributing.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contributing.md b/contributing.md index af19ed093..ae201d370 100644 --- a/contributing.md +++ b/contributing.md @@ -25,11 +25,11 @@ Git branches and their purpose and status at the time of this writing are 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 -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. + development takes place. The default branch on GitHub. +* [1.7-branch](https://github.com/Pylons/pyramid/tree/1.7-branch) - The branch + classified as "stable" or "latest". +* [1.6-branch](https://github.com/Pylons/pyramid/tree/1.6-branch) - The oldest + actively maintained and stable branch. Older branches are not actively maintained. In general, two stable branches and one or two development branches are actively maintained. |