diff options
| author | Chris McDonough <chrism@plope.com> | 2013-03-25 05:05:07 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-03-25 05:05:07 -0400 |
| commit | dacbe656d8851580234214fb655b60d24f5800fb (patch) | |
| tree | f0c39c064fd55b1141c7e96a62ae80a290acd8ff /docs/conf.py | |
| parent | 0bda2652728ae33ea37adc1f7f2f382e0ebbf4df (diff) | |
| parent | b4c0d4f0574b45c88f66530548ecaa7d6ad0baef (diff) | |
| download | pyramid-dacbe656d8851580234214fb655b60d24f5800fb.tar.gz pyramid-dacbe656d8851580234214fb655b60d24f5800fb.tar.bz2 pyramid-dacbe656d8851580234214fb655b60d24f5800fb.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
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), |