From: Harmon <Harmon758@gmail.com>
Date: Thu, 29 Apr 2021 10:14:26 +0000 (-0500)
Subject: Merge branch 'master' into async-streaming
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9946b948a7d0386c531cacaf21495719734f1b1d;p=tweepy.git

Merge branch 'master' into async-streaming
---

9946b948a7d0386c531cacaf21495719734f1b1d
diff --cc docs/conf.py
index adf4db2,0c65b0b..81ac5be
--- a/docs/conf.py
+++ b/docs/conf.py
@@@ -33,15 -33,9 +33,15 @@@ extensions = 
  
  intersphinx_mapping = {
    'python': ('https://docs.python.org/3', None),
 +  'aiohttp': ('https://docs.aiohttp.org/en/stable/', None),
-   'requests': ('https://docs.python-requests.org/en/latest/', None)
+   'requests': ('https://docs.python-requests.org/en/stable/', None)
  }
  
 +rst_prolog = """
 +.. |coroutine| replace:: This function is a coroutine_.
 +.. _coroutine: https://docs.python.org/3/library/asyncio-task.html#coroutine
 +"""
 +
  # Add any paths that contain templates here, relative to this directory.
  #templates_path = ['_templates']