summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2015-06-23 15:10:23 -0400
committerChris McDonough <chrism@plope.com>2015-06-23 15:10:23 -0400
commitf3b0c71139da13c88a660ef6edbe4d37ecb9e508 (patch)
tree980843f9df248a84b0094ed9090edadd0a0e7dea /CONTRIBUTORS.txt
parent713bc5f2785636327f4cee40d958bcff83afa9c5 (diff)
parent24b249c5afe5e3d97e327046252a0b3e42152580 (diff)
downloadpyramid-f3b0c71139da13c88a660ef6edbe4d37ecb9e508.tar.gz
pyramid-f3b0c71139da13c88a660ef6edbe4d37ecb9e508.tar.bz2
pyramid-f3b0c71139da13c88a660ef6edbe4d37ecb9e508.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 8eadbeecf..3405612ef 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -248,3 +248,5 @@ Contributors
- Donald Stufft, 2015/03/15
- Karen Dalton, 2015/06/01
+
+- Igor Stroh, 2015/06/10