Merge branch 'pr-twitter' of https://github.com/atomicdryad/youtube-dl into atomicdryad-pr-twitter

This commit is contained in:
Yen Chi Hsuan 2015-10-18 16:49:56 +08:00
commit c571dea953
2 changed files with 82 additions and 11 deletions

View file

@ -690,7 +690,7 @@ from .twitch import (
TwitchBookmarksIE,
TwitchStreamIE,
)
from .twitter import TwitterCardIE
from .twitter import TwitterCardIE, TwitterIE
from .ubu import UbuIE
from .udemy import (
UdemyIE,