summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMichael Merickel <mmerickel@users.noreply.github.com>2016-06-02 16:31:27 -0700
committerMichael Merickel <mmerickel@users.noreply.github.com>2016-06-02 16:31:27 -0700
commit281a670eefe741627a4523ed5acb74da9c5180b3 (patch)
tree50ab532b7974c4587001fc5488b2b80c3af4822c /CONTRIBUTORS.txt
parent382f93e2bfec5563587e306fda3fd34759314300 (diff)
parent5c0c7c621cf59738c32f4474db8bd7e91741c1c8 (diff)
downloadpyramid-281a670eefe741627a4523ed5acb74da9c5180b3.tar.gz
pyramid-281a670eefe741627a4523ed5acb74da9c5180b3.tar.bz2
pyramid-281a670eefe741627a4523ed5acb74da9c5180b3.zip
Merge pull request #2616 from m-martinez/issue-2609
Add route name to view deriver options. Closes: #2609
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 762793d0b..d40d7d79c 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -270,3 +270,5 @@ Contributors
- Vincent Férotin, 2016/05/08
- Berker Peksag, 2016/05/16
+
+- Marco Martinez, 2016/06/02