diff options
| author | Steve Piercy <web@stevepiercy.com> | 2013-03-25 01:26:49 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2013-03-25 01:26:49 -0700 |
| commit | 9ea10c8d04fcad07c633e1a10ed37d0809c69100 (patch) | |
| tree | 97d6c351ed2bbf6ddd317059f28964e901b38fde /docs/conf.py | |
| parent | 9c69d9a0de8c2a34820be05f36e32f68b29e5276 (diff) | |
| parent | 147903265781c96e295f44ce367729fabc950123 (diff) | |
| download | pyramid-9ea10c8d04fcad07c633e1a10ed37d0809c69100.tar.gz pyramid-9ea10c8d04fcad07c633e1a10ed37d0809c69100.tar.bz2 pyramid-9ea10c8d04fcad07c633e1a10ed37d0809c69100.zip | |
Merge remote 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 eff6db488..69d00cdaa 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -55,6 +55,7 @@ extensions = [ # Looks for objects in external projects intersphinx_mapping = { + 'webob': ('http://docs.webob.org/en/latest', None), 'sqla': ('http://docs.sqlalchemy.org/en/latest', None), 'who': ('http://docs.repoze.org/who/latest', None), 'python': ('http://docs.python.org', None), |