11 commits

Author	SHA1	Message	Date
Tom-Oliver Heidel	e908c55c9f	Merge branch 'tvnow' of https://github.com/TinyToweringTree/youtube-dl into TinyToweringTree-tvnow	2020-09-03 18:19:36 +02:00
Unknown	633c2852fb	[skip travis] twitch release.	2020-09-03 17:11:38 +02:00
Tom-Oliver Heidel	dac4ecf592	Merge branch 'twitch-fix' of https://github.com/lel-amri/youtube-dl into lel-amri-twitch-fix	2020-09-03 17:05:58 +02:00
Unknown	92dcea3d94	[skip travis] versioning in pypi is fun..	2020-09-03 05:55:10 +02:00
Unknown	c8ba06b7b6	bumping version	2020-09-03 05:28:57 +02:00
Tom-Oliver Heidel	22f9b078fd	Merge branch 'master' of https://github.com/ssaqua/youtube-dl into ssaqua-master	2020-09-03 04:34:56 +02:00
Unknown	3ca3f77f9c	[skip travis] adding automerge support ... basically copying content of youtube_dl folder to youtube_dlc and excluding the youtube_dl folder when compiling	2020-09-02 23:33:41 +02:00
Unknown	8c5fee2ea5	fix merge.	2020-09-02 23:03:04 +02:00
Unknown	3867038a06	renaming issues resolved	2020-09-02 22:37:35 +02:00
Unknown	66f4ffbbad	[skip travis] update version to dev	2020-09-02 22:06:45 +02:00
Unknown	cefecac12c	[skip travis] renaming ... to avoid using same folder when using pip install for example	2020-09-02 20:25:25 +02:00