diff options
| author | Steve Piercy <web@stevepiercy.com> | 2020-12-30 07:24:59 -0800 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2020-12-30 07:24:59 -0800 |
| commit | 2ca12d8a7b317120f4d2f9c7b60308f281e78357 (patch) | |
| tree | 61c9b775680dd4ea93e118f15614185f6fa42e25 /contributing.md | |
| parent | d1f88ec51042acb5a44106228cc4f8b7a3d772e0 (diff) | |
| parent | b24e9cf29b93c89b257497cd677ffcec3c9ad3a8 (diff) | |
| download | pyramid-2ca12d8a7b317120f4d2f9c7b60308f281e78357.tar.gz pyramid-2ca12d8a7b317120f4d2f9c7b60308f281e78357.tar.bz2 pyramid-2ca12d8a7b317120f4d2f9c7b60308f281e78357.zip | |
Merge branch 'master' of https://github.com/Pylons/pyramid
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 |