6 Commits (169bd46bdc54ae169ffcbb79b44ac1b3866d2ee3)

Author	SHA1	Message	Date
Tom-Oliver Heidel	10a4858d8f	Merge branch 'magenta' of https://github.com/adrianheine/youtube-dl into adrianheine-magenta	4 years ago
Tom-Oliver Heidel	51f8793699	Merge branch 'deezer' of https://github.com/LucBerge/youtube-dl into LucBerge-deezer	4 years ago
Tom-Oliver Heidel	e908c55c9f	Merge branch 'tvnow' of https://github.com/TinyToweringTree/youtube-dl into TinyToweringTree-tvnow	4 years ago
Tom-Oliver Heidel	22f9b078fd	Merge branch 'master' of https://github.com/ssaqua/youtube-dl into ssaqua-master	4 years ago
Unknown	8c5fee2ea5	fix merge.	4 years ago
Unknown	cefecac12c	[skip travis] renaming ... to avoid using same folder when using pip install for example	4 years ago