diff options
| author | Steve Piercy <web@stevepiercy.com> | 2017-05-02 00:34:35 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2017-05-02 00:34:35 -0700 |
| commit | 61083014ec4a2759a41a0008da3a2bd6c5bbb906 (patch) | |
| tree | fed8b63205320dde19c700ea5ad2099bcd624230 /docs/conf.py | |
| parent | 7d1e0646d701b35d61ca8800341c07afac31bb86 (diff) | |
| parent | fbfd8191cee8536078cc01cd2256378ba0711f22 (diff) | |
| download | pyramid-61083014ec4a2759a41a0008da3a2bd6c5bbb906.tar.gz pyramid-61083014ec4a2759a41a0008da3a2bd6c5bbb906.tar.bz2 pyramid-61083014ec4a2759a41a0008da3a2bd6c5bbb906.zip | |
Merge remote-tracking branch 'upstream/master'
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 df58064e5..f09ae325b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -67,6 +67,7 @@ intersphinx_mapping = { 'cookiecutter': ('https://cookiecutter.readthedocs.io/en/latest/', None), 'deform': ('http://docs.pylonsproject.org/projects/deform/en/latest', None), 'jinja2': ('http://docs.pylonsproject.org/projects/pyramid-jinja2/en/latest/', None), + '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), |