summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-01-31 16:18:02 -0600
committerMichael Merickel <michael@merickel.org>2016-01-31 16:18:02 -0600
commit3eb1c354d320536ee470b79dcb930d20da93d97d (patch)
tree18aa7fa0a4293919c1ed67ee7f8aae6372abcb06 /CONTRIBUTORS.txt
parent67f733e161f19bb2b7322edd120b9bf489154536 (diff)
parent9c01bf58c211bf9c28f8043459a5a0e9b25a5c35 (diff)
downloadpyramid-3eb1c354d320536ee470b79dcb930d20da93d97d.tar.gz
pyramid-3eb1c354d320536ee470b79dcb930d20da93d97d.tar.bz2
pyramid-3eb1c354d320536ee470b79dcb930d20da93d97d.zip
Merge branch 'master' into feature/alchemy-scaffold-update
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 b8f3b6bc8..49b8c11cd 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -260,3 +260,5 @@ Contributors
- Rami Chousein, 2015/10/28
- Sri Sanketh Uppalapati, 2015/12/12
+
+- Marcin RaczyƄski, 2016/01/26