diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-04-16 15:00:46 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2016-04-16 15:00:46 -0700 |
| commit | d19e9902ede0b1cc40991b423c12e8a95d430e0e (patch) | |
| tree | 1ae26e5443801e881009a40169a394a9561bdacb /docs/conf.py | |
| parent | 1eea18ab7f1428ba8ac01a238f03ddbf8483593b (diff) | |
| parent | d729f7d47b90d47d7e40fd5d1df449582f1c4eca (diff) | |
| download | pyramid-d19e9902ede0b1cc40991b423c12e8a95d430e0e.tar.gz pyramid-d19e9902ede0b1cc40991b423c12e8a95d430e0e.tar.bz2 pyramid-d19e9902ede0b1cc40991b423c12e8a95d430e0e.zip | |
Merge pull request #2508 from stevepiercy/1.7-branch
Merge pull request #2505 from stevepiercy/docs/quick-tour-gotcher-nose
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/conf.py b/docs/conf.py index 1600e1f5c..c40f1c875 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -67,6 +67,7 @@ intersphinx_mapping = { 'jinja2': ('http://docs.pylonsproject.org/projects/pyramid-jinja2/en/latest/', None), 'pylonswebframework': ('http://docs.pylonsproject.org/projects/pylons-webframework/en/latest/', None), 'python': ('https://docs.python.org/3', None), + 'pytest': ('http://pytest.org/latest/', None), 'sqla': ('http://docs.sqlalchemy.org/en/latest', None), 'tm': ('http://docs.pylonsproject.org/projects/pyramid-tm/en/latest/', None), 'toolbar': ('http://docs.pylonsproject.org/projects/pyramid-debugtoolbar/en/latest', None), |