Merge branch 'ping-viki-shows'

2015-05-20 22:10:06 +06:00 · 2015-05-20 22:10:06 +06:00 · ca57a59883
commit ca57a59883
parent 0b9f7cd074 b0d619fde2
2 changed files with 60 additions and 3 deletions
--- a/youtube_dl/extractor/init.py
+++ b/youtube_dl/extractor/init.py
@ -647,7 +647,10 @@ from .vine import (
    VineIE,
    VineUserIE,
 )
-from .viki import VikiIE
+from .viki import (
+    VikiIE,
+    VikiChannelIE,
+)
 from .vk import (
    VKIE,
    VKUserVideosIE,