summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-11-13 17:55:58 -0500
committerChris McDonough <chrism@plope.com>2012-11-13 17:55:58 -0500
commit3563e7f4ee334f2e9edef3f2aa9336206b20a05c (patch)
treea23986df49345b160ae4b7aba0c7c3d7a6f20fb1 /CONTRIBUTORS.txt
parentd8d3a919f6a2a17db7ef20cea9a867bc0ec714a5 (diff)
parent01c76b8bf509bbad41336d00d832241e7e02aa9e (diff)
downloadpyramid-3563e7f4ee334f2e9edef3f2aa9336206b20a05c.tar.gz
pyramid-3563e7f4ee334f2e9edef3f2aa9336206b20a05c.tar.bz2
pyramid-3563e7f4ee334f2e9edef3f2aa9336206b20a05c.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 d03da3e62..34d904d0f 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -188,3 +188,5 @@ Contributors
- Domen Kozar, 2012/09/11
- David Gay, 2012/09/16
+
+- Robert Jackiewicz, 2012/11/12