summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2016-01-03 02:09:59 -0700
committerBert JW Regeer <bertjw@regeer.org>2016-01-03 02:09:59 -0700
commita2dff0592714d9cde5a0a612411aa96ce9d94b3c (patch)
tree6dac581990ba758670a8424cafe8bf31888471f7 /CONTRIBUTORS.txt
parent29e1002a108d045e1f80be3137f2cde4e47ca642 (diff)
parent5558386fd1a6181b2e8ad06659049c055a7ed023 (diff)
downloadpyramid-a2dff0592714d9cde5a0a612411aa96ce9d94b3c.tar.gz
pyramid-a2dff0592714d9cde5a0a612411aa96ce9d94b3c.tar.bz2
pyramid-a2dff0592714d9cde5a0a612411aa96ce9d94b3c.zip
Merge branch 'master' into feature/alchemy-scaffold-update
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 0c79b9a41..b8f3b6bc8 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -256,3 +256,7 @@ Contributors
- Jesse Dhillon, 2015/10/07
- Amos Latteier, 2015/10/22
+
+- Rami Chousein, 2015/10/28
+
+- Sri Sanketh Uppalapati, 2015/12/12