schmittlauch/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'pulpe/teachertube'

Browse source 
Conflicts:
	youtube_dl/extractor/__init__.py
This commit is contained in:
Philipp Hagemeister 2014-06-07 15:20:12 +02:00
commit 24f5251cce
3 changed files with 98 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
youtube_dl/extractor/__init__.py
View file

@ -267,6 +267,10 @@ from .swrmediathek import SWRMediathekIE
from .syfy import SyfyIE
from .sztvhu import SztvHuIE
from .tagesschau import TagesschauIE
from .teachertube import (
TeacherTubeIE,
TeacherTubeClassroomIE,
)
from .teachingchannel import TeachingChannelIE
from .teamcoco import TeamcocoIE
from .techtalks import TechTalksIE