diff options
| author | Chris McDonough <chrism@plope.com> | 2012-05-03 11:24:51 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-05-03 11:24:51 -0400 |
| commit | a0bb6b2af64ca27d719d9378b679fb7737e906de (patch) | |
| tree | fa0b358458db5961b6ceebf95493fe65f5e1bf40 | |
| parent | 5851d82e08209a83bb6aa311cfbf4e3ab65c29fe (diff) | |
| parent | 09f82e5e0290ff329b611c3ad8d1b0636005185f (diff) | |
| download | pyramid-a0bb6b2af64ca27d719d9378b679fb7737e906de.tar.gz pyramid-a0bb6b2af64ca27d719d9378b679fb7737e906de.tar.bz2 pyramid-a0bb6b2af64ca27d719d9378b679fb7737e906de.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | CONTRIBUTORS.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 4b780d3a7..98f73d5f9 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -170,3 +170,5 @@ Contributors - Steve Piercy, 2012/03/27 - Wayne Witzel III, 2012/03/27 + +- Marin Rukavina, 2012/05/03 |