diff options
| author | Michael Merickel <michael@merickel.org> | 2017-06-18 01:46:27 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2017-06-18 01:46:27 -0500 |
| commit | 75c30dfe18b26ca04efae2acbe35052fa0d93ed6 (patch) | |
| tree | ebb57879035b60a801cd4deb113c4091956b67be /docs/conf.py | |
| parent | 4983421128e2e0fc92c771510f7b3af57de6d855 (diff) | |
| parent | 5c437abba0926f6093efbd481e49763de2436665 (diff) | |
| download | pyramid-75c30dfe18b26ca04efae2acbe35052fa0d93ed6.tar.gz pyramid-75c30dfe18b26ca04efae2acbe35052fa0d93ed6.tar.bz2 pyramid-75c30dfe18b26ca04efae2acbe35052fa0d93ed6.zip | |
Merge branch 'master' into pr/3034
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/conf.py b/docs/conf.py index f09ae325b..e63019c63 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -70,7 +70,7 @@ intersphinx_mapping = { 'plaster': ('http://docs.pylonsproject.org/projects/plaster/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), + 'pytest': ('https://pytest.org/en/latest/', None), 'sphinx': ('http://www.sphinx-doc.org/en/latest', None), 'sqla': ('http://docs.sqlalchemy.org/en/latest', None), 'tm': ('http://docs.pylonsproject.org/projects/pyramid-tm/en/latest/', None), |