summaryrefslogtreecommitdiff
path: root/contributing.md
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-04-16 15:54:49 -0500
committerMichael Merickel <michael@merickel.org>2016-04-16 15:54:49 -0500
commit1eea18ab7f1428ba8ac01a238f03ddbf8483593b (patch)
treeee86f80c92a596041ce1f6afd46ebb3ea8947b63 /contributing.md
parent3d5dbd2c599fc724ebf105708f75d8768530e855 (diff)
downloadpyramid-1eea18ab7f1428ba8ac01a238f03ddbf8483593b.tar.gz
pyramid-1eea18ab7f1428ba8ac01a238f03ddbf8483593b.tar.bz2
pyramid-1eea18ab7f1428ba8ac01a238f03ddbf8483593b.zip
prep 1.7a1
Diffstat (limited to 'contributing.md')
-rw-r--r--contributing.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/contributing.md b/contributing.md
index af19ed093..1393a2507 100644
--- a/contributing.md
+++ b/contributing.md
@@ -26,6 +26,8 @@ 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
+classified as alpha. Actively maintained.
* [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