diff options
| author | Steve Piercy <web@stevepiercy.com> | 2017-05-12 21:24:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-12 21:24:15 -0700 |
| commit | 5f3b95cf3e1b3005007e739d0e008b21cff2babf (patch) | |
| tree | c69983404d7b9b8db62640809e6b81c5e46677b4 /contributing.md | |
| parent | b5444950d84c507f26764a16021db6e01d0461e3 (diff) | |
| parent | a7d60de001ba14023d20d701d9697ad7d8de1dd4 (diff) | |
| download | pyramid-5f3b95cf3e1b3005007e739d0e008b21cff2babf.tar.gz pyramid-5f3b95cf3e1b3005007e739d0e008b21cff2babf.tar.bz2 pyramid-5f3b95cf3e1b3005007e739d0e008b21cff2babf.zip | |
Merge branch 'master' into change-to-localhost
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 |