summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-12-06 02:55:52 -0800
committerGitHub <noreply@github.com>2016-12-06 02:55:52 -0800
commitfedfacf0bd1cbefbe922618d4df93917465f1307 (patch)
tree818259ca5e25cfb7593589301eb8e2d32755e99a /CONTRIBUTORS.txt
parentc7974fe0a3363d84afd0db506dbc71b97cb84247 (diff)
parent9c120b5e9983c89bd9824269801b4d463d5c892a (diff)
downloadpyramid-fedfacf0bd1cbefbe922618d4df93917465f1307.tar.gz
pyramid-fedfacf0bd1cbefbe922618d4df93917465f1307.tar.bz2
pyramid-fedfacf0bd1cbefbe922618d4df93917465f1307.zip
Merge pull request #2848 from miohtama/fix/sphinx-1.5
Fix docs for Sphinx 1.5
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 98e243c1f..b4e30e085 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -286,3 +286,5 @@ Contributors
- Keith Yang, 2016/07/22
- Moriyoshi Koizumi, 2016/11/20
+
+- Mikko Ohtamaa, 2016/12/6