diff options
| author | Sergey M․ <dstftw@gmail.com> | 2015-05-16 21:28:36 +0600 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-05-16 21:28:36 +0600 |
| commit | 363cf58645d021810b7fd579084de07471407ae3 (patch) | |
| tree | c159aff12985d2875912c5c64c9d6a42c04f2033 /youtube_dl/extractor/__init__.py | |
| parent | 7e760fc18897663db7c0717434e28a8cca9f3810 (diff) | |
| parent | 2f3bdab2b90c6695c0a478f352967b0c9da4f23f (diff) | |
Merge branch 'viki-shows' of https://github.com/ping/youtube-dl into ping-viki-shows
Diffstat (limited to 'youtube_dl/extractor/__init__.py')
| -rw-r--r-- | youtube_dl/extractor/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 6b19eb6f8..8c28cdc71 100644 --- 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, |