Merge pull request #2320 from stevepiercy/1.5-branch

Steve Piercy

2016-01-31 cb124e0dbd290a822a3523ddaed18b1e087946ce

Merge pull request #2320 from stevepiercy/1.5-branch

latest_url is not needed after all

 docs/conf.py

@@ -148,7 +148,6 @@
    in_progress='false',
    # on previous branches/major releases true, else false
    outdated='true',
    latest_url='http://docs.pylonsproject.org/projects/pyramid/en/latest/',
    )

# The name for this set of Sphinx documents.  If None, it defaults to