Merge remote-tracking branch 'dstftw/channel9'
Conflicts: youtube_dl/extractor/__init__.py
This commit is contained in:
		@@ -21,6 +21,7 @@ from .c56 import C56IE
 | 
			
		||||
from .canalplus import CanalplusIE
 | 
			
		||||
from .canalc2 import Canalc2IE
 | 
			
		||||
from .cbs import CBSIE
 | 
			
		||||
from .channel9 import Channel9IE
 | 
			
		||||
from .cinemassacre import CinemassacreIE
 | 
			
		||||
from .clipfish import ClipfishIE
 | 
			
		||||
from .clipsyndicate import ClipsyndicateIE
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user