Merge branch 'master' into python-3.5-support-removal
authorHarmon <Harmon758@gmail.com>
Mon, 28 Dec 2020 12:59:56 +0000 (06:59 -0600)
committerGitHub <noreply@github.com>
Mon, 28 Dec 2020 12:59:56 +0000 (06:59 -0600)
1  2 
setup.py
tweepy/auth.py
tweepy/streaming.py

diff --cc setup.py
Simple merge
diff --cc tweepy/auth.py
Simple merge
Simple merge