Merge branch 'viki-shows' of https://github.com/ping/youtube-dl into ping-viki-shows

2015-05-16 21:28:36 +06:00 · 2015-05-16 21:28:36 +06:00 · 363cf58645
commit 363cf58645
parent 7e760fc188 2f3bdab2b9
2 changed files with 36 additions and 1 deletions
--- a/youtube_dl/extractor/init.py
+++ b/youtube_dl/extractor/init.py
@ -643,7 +643,10 @@ from .vine import (
    VineIE,
    VineUserIE,
 )
-from .viki import VikiIE
+from .viki import (
+    VikiIE,
+    VikiShowIE,
+)
 from .vk import (
    VKIE,
    VKUserVideosIE,