aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/__init__.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-05-20 22:10:06 +0600
committerSergey M․ <dstftw@gmail.com>2015-05-20 22:10:06 +0600
commitca57a598838f7d945a09a1df569e1c29fdd0732b (patch)
treebdb1b8e1eef77405f719ed0dddeef71a752b8b04 /youtube_dl/extractor/__init__.py
parent0b9f7cd074786abafcd35b26db4ecb4d92814393 (diff)
parentb0d619fde2b187f2b36b077a1eb11d766429f88c (diff)
downloadyoutube-dl-ca57a598838f7d945a09a1df569e1c29fdd0732b.tar.xz
Merge branch 'ping-viki-shows'
Diffstat (limited to 'youtube_dl/extractor/__init__.py')
-rw-r--r--youtube_dl/extractor/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 6f8c261d5..24efb7ce5 100644
--- 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,