aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/__init__.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-05-13 09:45:27 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-05-13 09:45:27 +0200
commit7b93c2c204d7bad9285b5c9db12ff2acb01338e6 (patch)
treefceb21316e744e1caa393dee47431fe371a66d67 /youtube_dl/extractor/__init__.py
parent57c7411f4615cda595f06fa461719b4336d808f4 (diff)
parentea783d01e1bbe56657bff752d062bfb1d8a9bc3e (diff)
downloadyoutube-dl-7b93c2c204d7bad9285b5c9db12ff2acb01338e6.tar.xz
Merge remote-tracking branch 'jnormore/vine_user'
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 b5953abe5..cfe17a268 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -306,7 +306,10 @@ from .vimeo import (
VimeoReviewIE,
VimeoWatchLaterIE,
)
-from .vine import VineIE
+from .vine import (
+ VineIE,
+ VineUserIE,
+)
from .viki import VikiIE
from .vk import VKIE
from .vube import VubeIE