diff options
| author | Steve Piercy <web@stevepiercy.com> | 2017-05-02 00:34:35 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2017-05-02 00:34:35 -0700 |
| commit | 61083014ec4a2759a41a0008da3a2bd6c5bbb906 (patch) | |
| tree | fed8b63205320dde19c700ea5ad2099bcd624230 /contributing.md | |
| parent | 7d1e0646d701b35d61ca8800341c07afac31bb86 (diff) | |
| parent | fbfd8191cee8536078cc01cd2256378ba0711f22 (diff) | |
| download | pyramid-61083014ec4a2759a41a0008da3a2bd6c5bbb906.tar.gz pyramid-61083014ec4a2759a41a0008da3a2bd6c5bbb906.tar.bz2 pyramid-61083014ec4a2759a41a0008da3a2bd6c5bbb906.zip | |
Merge remote-tracking branch 'upstream/master'
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 9deeee035..82f60e7b8 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.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.7-branch](https://github.com/Pylons/pyramid/tree/1.7-branch) - The oldest |