Merge pull request #832 from fitnr/json

author Harmon <Harmon758@gmail.com>

Sat, 4 May 2019 05:24:31 +0000 (00:24 -0500)

committer GitHub <noreply@github.com>

Sat, 4 May 2019 05:24:31 +0000 (00:24 -0500)
author Harmon <Harmon758@gmail.com>
Sat, 4 May 2019 05:24:31 +0000 (00:24 -0500)
committer GitHub <noreply@github.com>
Sat, 4 May 2019 05:24:31 +0000 (00:24 -0500)
diff --cc tweepy/parsers.py
Simple merge
diff --cc tweepy/streaming.py
Simple merge
diff --cc tweepy/utils.py
Simple merge
author	Harmon <Harmon758@gmail.com>
	Sat, 4 May 2019 05:24:31 +0000 (00:24 -0500)
committer	GitHub <noreply@github.com>
	Sat, 4 May 2019 05:24:31 +0000 (00:24 -0500)
		1	2
tweepy/parsers.py	patch \|	diff1 \|	diff2 \|	blob \| history
tweepy/streaming.py	patch \|	diff1 \|	diff2 \|	blob \| history
tweepy/utils.py	patch \|	diff1 \|	diff2 \|	blob \| history