Merge pull request #1484 from dplefevre/doc_fix

author Harmon <Harmon758@gmail.com>

Tue, 29 Dec 2020 08:45:43 +0000 (02:45 -0600)

committer GitHub <noreply@github.com>

Tue, 29 Dec 2020 08:45:43 +0000 (02:45 -0600)
author Harmon <Harmon758@gmail.com>
Tue, 29 Dec 2020 08:45:43 +0000 (02:45 -0600)
committer GitHub <noreply@github.com>
Tue, 29 Dec 2020 08:45:43 +0000 (02:45 -0600)
diff --cc tests/test_api.py
Simple merge
diff --cc tweepy/api.py
Simple merge
author	Harmon <Harmon758@gmail.com>
	Tue, 29 Dec 2020 08:45:43 +0000 (02:45 -0600)
committer	GitHub <noreply@github.com>
	Tue, 29 Dec 2020 08:45:43 +0000 (02:45 -0600)
		1	2
tests/test_api.py	patch \|	diff1 \|	diff2 \|	blob \| history
tweepy/api.py	patch \|	diff1 \|	diff2 \|	blob \| history