summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMichael Merickel <github@m.merickel.org>2018-11-12 20:07:15 -0600
committerGitHub <noreply@github.com>2018-11-12 20:07:15 -0600
commit7429fcb5a96aa10bbe86da08bd0b30c9292efdde (patch)
tree548defadbf50447b4e6a0b1f9363f3d08ded8bfc /CONTRIBUTORS.txt
parent420ea05bee3ad376c4369f401b2696b31312c5e1 (diff)
parent2d32ae81abc473fb21b4bc42aec479c656693f1c (diff)
downloadpyramid-7429fcb5a96aa10bbe86da08bd0b30c9292efdde.tar.gz
pyramid-7429fcb5a96aa10bbe86da08bd0b30c9292efdde.tar.bz2
pyramid-7429fcb5a96aa10bbe86da08bd0b30c9292efdde.zip
Merge pull request #3420 from mmerickel/bare-route-prefix-2
support inherit_slash=True on add_route
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 7256b66db..79e4287d2 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -297,6 +297,8 @@ Contributors
- Kirill Kuzminykh, 2017/03/01
+- Charlie Choiniere, 2017/04/03
+
- Aleph Melo, 2017/04/16
- Jeremy(Ching-Rui) Chen, 2017/04/19