diff options
author | Philipp Hagemeister <phihag@phihag.de> | 2014-02-15 15:32:13 +0100 |
---|---|---|
committer | Philipp Hagemeister <phihag@phihag.de> | 2014-02-15 15:32:13 +0100 |
commit | 4edff78531c42aa126b02a9b792f84d2775c2172 (patch) | |
tree | 67f29a6706b9314a9013d8fe826f826340de2fd3 /youtube_dl/extractor/__init__.py | |
parent | 72ca1d7f45488d746337cdf61a70ff25d9e8411b (diff) | |
parent | cf1eb4515315f7cb01ccb4fbac31928040f5ce04 (diff) |
Merge remote-tracking branch 'jaimeMF/f4m'
Conflicts:
youtube_dl/extractor/__init__.py
Diffstat (limited to 'youtube_dl/extractor/__init__.py')
-rw-r--r-- | youtube_dl/extractor/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 3a8cd8a58..8715da7db 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -209,6 +209,7 @@ from .statigram import StatigramIE from .steam import SteamIE from .streamcloud import StreamcloudIE from .streamcz import StreamCZIE +from .syfy import SyfyIE from .sztvhu import SztvHuIE from .teamcoco import TeamcocoIE from .techtalks import TechTalksIE |