diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-02-03 05:19:28 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-02-03 05:19:28 +0100 |
| commit | 8e93b9b9aae0e31f053eaa8c5cbfebfbab2dfbab (patch) | |
| tree | 09302efc99e9388de5688c0d5f525ca273a89c70 /youtube_dl/extractor/__init__.py | |
| parent | b4bcffefa3883ec469457cf13e500d1180d4931e (diff) | |
| parent | 2b39af9b4f8cea51f11fbec726aca0482b671256 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
youtube_dl/extractor/bliptv.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 9b346ac68..073f3a0d1 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -200,6 +200,7 @@ from .ted import TEDIE from .tf1 import TF1IE from .theplatform import ThePlatformIE from .thisav import ThisAVIE +from .tinypic import TinyPicIE from .toutv import TouTvIE from .traileraddict import TrailerAddictIE from .trilulilu import TriluliluIE |