diff options
| author | Chris McDonough <chrism@plope.com> | 2013-08-28 12:52:20 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-08-28 12:52:20 -0400 |
| commit | 230157fcc3a3d3bd4658189aa5588da41b2da840 (patch) | |
| tree | 9d4d149375fb02748568c8dbc6a7d2b4f82e1d99 /CONTRIBUTORS.txt | |
| parent | 8ac9ae83d7deb7909733e6490cad52beb88190ad (diff) | |
| parent | 81870840254227b76f537d2f0003f072863aa436 (diff) | |
| download | pyramid-230157fcc3a3d3bd4658189aa5588da41b2da840.tar.gz pyramid-230157fcc3a3d3bd4658189aa5588da41b2da840.tar.bz2 pyramid-230157fcc3a3d3bd4658189aa5588da41b2da840.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 591dcd7e4..0ddaebf15 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -218,3 +218,5 @@ Contributors - Andreas Zeidler, 2013/08/15 - Matthew Wilkes, 2013/08/23 + +- Takahiro Fujiwara, 2013/08/28 |