summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2018-07-02 13:52:55 -0400
committerChris McDonough <chrism@plope.com>2018-07-02 13:52:55 -0400
commit0c8ca237d1bb1ff0f6e3776a3c868edb040fa791 (patch)
tree57498768d48ce74a753dec8f359b5646acf30655 /CONTRIBUTORS.txt
parent50efc321cb14d76433216783c11b9eb99a7d44c8 (diff)
parent57a896f103c7378fb285f6594228578a5324d672 (diff)
downloadpyramid-0c8ca237d1bb1ff0f6e3776a3c868edb040fa791.tar.gz
pyramid-0c8ca237d1bb1ff0f6e3776a3c868edb040fa791.tar.bz2
pyramid-0c8ca237d1bb1ff0f6e3776a3c868edb040fa791.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index b6dbcff2c..a56821e74 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -316,3 +316,13 @@ Contributors
- Deneys Maartens, 2017/11/03
- Heron Rossi, 2018/03/08
+
+- Hunter Senft-Grupp, 2018/05/14
+
+- Junhak Lee, 2018/05/14
+
+- Alex Gaynor, 2018/05/24
+
+- Jason Williams, 2018/06/11
+
+- Benjamin Gmurczyk, 2018/06/14