summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-12-06 04:24:04 -0800
committerGitHub <noreply@github.com>2016-12-06 04:24:04 -0800
commit7ab666e3e2539662ff3324a4bdedbca3c8f8040a (patch)
treeb34855b833113681b8ce7ba1001d1a2a8a089775 /CONTRIBUTORS.txt
parentfedfacf0bd1cbefbe922618d4df93917465f1307 (diff)
parent0705eeaa820b32a4c3f2a05df21e99077586cf5e (diff)
downloadpyramid-7ab666e3e2539662ff3324a4bdedbca3c8f8040a.tar.gz
pyramid-7ab666e3e2539662ff3324a4bdedbca3c8f8040a.tar.bz2
pyramid-7ab666e3e2539662ff3324a4bdedbca3c8f8040a.zip
Merge pull request #2847 from mfrlin/issue-2656
Changed 'host' and 'port' configuration to a new 'listen' style that …
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 b4e30e085..126b286f8 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -288,3 +288,5 @@ Contributors
- Moriyoshi Koizumi, 2016/11/20
- Mikko Ohtamaa, 2016/12/6
+
+- Martin Frlin, 2016/12/6