summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2017-06-18 01:46:27 -0500
committerMichael Merickel <michael@merickel.org>2017-06-18 01:46:27 -0500
commit75c30dfe18b26ca04efae2acbe35052fa0d93ed6 (patch)
treeebb57879035b60a801cd4deb113c4091956b67be /CONTRIBUTORS.txt
parent4983421128e2e0fc92c771510f7b3af57de6d855 (diff)
parent5c437abba0926f6093efbd481e49763de2436665 (diff)
downloadpyramid-75c30dfe18b26ca04efae2acbe35052fa0d93ed6.tar.gz
pyramid-75c30dfe18b26ca04efae2acbe35052fa0d93ed6.tar.bz2
pyramid-75c30dfe18b26ca04efae2acbe35052fa0d93ed6.zip
Merge branch 'master' into pr/3034
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index b8fb081ec..242fbbcda 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -297,6 +297,14 @@ Contributors
- Kirill Kuzminykh, 2017/03/01
+- Aleph Melo, 2017/04/16
+
- Jeremy(Ching-Rui) Chen, 2017/04/19
- Russell Ballestrini, 2017/05/06
+
+- Fang-Pen Lin, 2017/05/22
+
+- Volker Diels-Grabsch, 2017/06/09
+
+- Denis Rykov, 2017/06/15