diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-06-07 15:20:12 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-06-07 15:20:12 +0200 |
| commit | 24f5251cce172f0e403b4178819dd26b3873f021 (patch) | |
| tree | d7748f7af049920740a58ac7b53ecef283a2d5bb /youtube_dl/extractor/__init__.py | |
| parent | ac1390eee838d35b76d356e4e68bd430843d3439 (diff) | |
| parent | b4e7447458770a705c064d0eb7f73f49dc885557 (diff) | |
| download | youtube-dl-24f5251cce172f0e403b4178819dd26b3873f021.tar.xz | |
Merge remote-tracking branch 'pulpe/teachertube'
Conflicts:
youtube_dl/extractor/__init__.py
Diffstat (limited to 'youtube_dl/extractor/__init__.py')
| -rw-r--r-- | youtube_dl/extractor/__init__.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 32ef08c52..a19e85543 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -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 |