Merge pull request #245 from pukkandan/merge-main

author Tom-Oliver Heidel <redacted>

Mon, 30 Nov 2020 01:20:18 +0000 (02:20 +0100)

committer GitHub <redacted>

Mon, 30 Nov 2020 01:20:18 +0000 (02:20 +0100)
author Tom-Oliver Heidel <redacted>
Mon, 30 Nov 2020 01:20:18 +0000 (02:20 +0100)
committer GitHub <redacted>
Mon, 30 Nov 2020 01:20:18 +0000 (02:20 +0100)
diff --cc docs/supportedsites.md
Simple merge
diff --cc youtube_dlc/extractor/extractors.py
Simple merge
author	Tom-Oliver Heidel <redacted>
	Mon, 30 Nov 2020 01:20:18 +0000 (02:20 +0100)
committer	GitHub <redacted>
	Mon, 30 Nov 2020 01:20:18 +0000 (02:20 +0100)
		1	2
docs/supportedsites.md	patch \|	diff1 \|	diff2 \|	blob \| history
youtube_dlc/extractor/extractors.py	patch \|	diff1 \|	diff2 \|	blob \| history