summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-09-15 19:23:16 -0400
committerChris McDonough <chrism@plope.com>2012-09-15 19:23:16 -0400
commita98f0cf435e31864e632d9105ffdda30aa776212 (patch)
treef75042c8b99e414eac88ade8f701871acf655e8d /CONTRIBUTORS.txt
parent07cb8f0e112642a6a40127232ddc06125a73750e (diff)
parent8402b63ff8edf2ae6268108afbdb3180a64c730b (diff)
downloadpyramid-a98f0cf435e31864e632d9105ffdda30aa776212.tar.gz
pyramid-a98f0cf435e31864e632d9105ffdda30aa776212.tar.bz2
pyramid-a98f0cf435e31864e632d9105ffdda30aa776212.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 264acf048..bb11006f3 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -182,3 +182,5 @@ Contributors
- Ian Wilson, 2012/06/17
- Roman Kozlovskyi, 2012/08/11
+
+- Domen Kozar, 2012/09/11