diff options
| author | Theron Luhn <theron@luhn.com> | 2020-12-11 09:21:41 -0800 |
|---|---|---|
| committer | Theron Luhn <theron@luhn.com> | 2020-12-11 09:21:41 -0800 |
| commit | 43bd1a16de441d971bb6e1f3f6dbae055394e324 (patch) | |
| tree | a87e5f7e18b224b9a2f8a2751f972d550751e48b /contributing.md | |
| parent | 86cb46d4d977d3a948308326bee628421cab93ea (diff) | |
| parent | 6cf061e170039ff48e7f892f1176d1ab359e2001 (diff) | |
| download | pyramid-43bd1a16de441d971bb6e1f3f6dbae055394e324.tar.gz pyramid-43bd1a16de441d971bb6e1f3f6dbae055394e324.tar.bz2 pyramid-43bd1a16de441d971bb6e1f3f6dbae055394e324.zip | |
Merge remote-tracking branch 'upstream/master' into wiki2-request-identity
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 3b096db5d..534b399c6 100644 --- a/contributing.md +++ b/contributing.md @@ -14,6 +14,8 @@ Git branches and their purpose and status at the time of this writing are listed * [master](https://github.com/Pylons/pyramid/) - The branch on which further development takes place. The default branch on GitHub. +* [2.0-branch](https://github.com/Pylons/pyramid/tree/2.0-branch) - The branch + classified as "alpha". * [1.10-branch](https://github.com/Pylons/pyramid/tree/1.10-branch) - The branch classified as "stable" or "latest". * [1.9-branch](https://github.com/Pylons/pyramid/tree/1.9-branch) - The oldest |