diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-04-17 15:47:07 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2016-04-17 15:47:07 -0700 |
| commit | ff9e625e7ea30373aa8ed6286b098c92369c43d0 (patch) | |
| tree | 3f26093b692d150e9d51a656d295adf4f5f8e91c /contributing.md | |
| parent | d9c20d0a5002052df675b8a06b2e8711dc1cb586 (diff) | |
| parent | a575d1f9d77195d53f55fa8b409bd7c21f3f64de (diff) | |
| download | pyramid-ff9e625e7ea30373aa8ed6286b098c92369c43d0.tar.gz pyramid-ff9e625e7ea30373aa8ed6286b098c92369c43d0.tar.bz2 pyramid-ff9e625e7ea30373aa8ed6286b098c92369c43d0.zip | |
Merge pull request #2513 from stevepiercy/master
update RELEASING.txt to better account for master and previous branches
Diffstat (limited to 'contributing.md')
| -rw-r--r-- | contributing.md | 2 |
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 |