summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2017-06-19 21:33:54 -0500
committerGitHub <noreply@github.com>2017-06-19 21:33:54 -0500
commit5a1950121af5f70c473ce8e74b6d9044e8b9e375 (patch)
treeb5bb07947ee0e809161c2fe1243e830d7a3263ea /CONTRIBUTORS.txt
parent5c437abba0926f6093efbd481e49763de2436665 (diff)
parenteffe0e6c5adf64ac99f54082121373f84be4611b (diff)
downloadpyramid-5a1950121af5f70c473ce8e74b6d9044e8b9e375.tar.gz
pyramid-5a1950121af5f70c473ce8e74b6d9044e8b9e375.tar.bz2
pyramid-5a1950121af5f70c473ce8e74b6d9044e8b9e375.zip
Merge pull request #3034 from russellballestrini/1.9-refactor-parse-url-overrides
refactor parse_url_overrides
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 32c0833b4..242fbbcda 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -301,6 +301,8 @@ Contributors
- Jeremy(Ching-Rui) Chen, 2017/04/19
+- Russell Ballestrini, 2017/05/06
+
- Fang-Pen Lin, 2017/05/22
- Volker Diels-Grabsch, 2017/06/09