diff options
| author | Chris McDonough <chrism@plope.com> | 2011-11-07 12:28:49 -0800 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-11-07 12:28:49 -0800 |
| commit | b9eac7ede70525b04bc0cf5341e258b92a2edb96 (patch) | |
| tree | c1c259aad926500540cbd8b00548f342303730a9 | |
| parent | 9e7c1195b1e0fc1f82335877f9ad085fbb034e7b (diff) | |
| parent | 150f88c1c04bb9548c85fec7a9a78e54907fb8d0 (diff) | |
| download | pyramid-b9eac7ede70525b04bc0cf5341e258b92a2edb96.tar.gz pyramid-b9eac7ede70525b04bc0cf5341e258b92a2edb96.tar.bz2 pyramid-b9eac7ede70525b04bc0cf5341e258b92a2edb96.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | CONTRIBUTORS.txt | 2 | ||||
| -rw-r--r-- | rtd.txt (renamed from rtd_requirements.txt) | 0 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index a368fb4d2..23f3cd6ee 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -148,3 +148,5 @@ Contributors - Shane Hathaway, 2011/07/22 - Manuel Hermann, 2011/07/11 + +- Chris Shenton, 2011/11/07 diff --git a/rtd_requirements.txt b/rtd.txt index 9de7ff3bb..9de7ff3bb 100644 --- a/rtd_requirements.txt +++ b/rtd.txt |