From 396c5a116982626049c66488750de24e2967dc71 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Fri, 12 May 2017 10:38:58 +0200
Subject: [PATCH] Merge pull request #3037 from stevepiercy/1.8-branch

---
 docs/conf.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index f095b42..9b0c8e9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -69,7 +69,7 @@
     '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),
+    '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),

--
Gitblit v1.9.3