]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Merge branch 'bliptv' of github.com:remitamine/youtube-dl into remitamine-bliptv
authorremitamine <remitamine@gmail.com>
Mon, 21 Dec 2015 03:31:17 +0000 (04:31 +0100)
committerremitamine <remitamine@gmail.com>
Mon, 21 Dec 2015 03:31:17 +0000 (04:31 +0100)
1  2 
youtube_dl/extractor/__init__.py
youtube_dl/extractor/generic.py

Simple merge
index 7cf13fddfe37fa1bf2d2e6329c060f9d4c6286f7,f5dd88f5444f78c860340546eaedcc0ddea9fc0f..3c3066e38c5efb4734e1c564be38424d4bd4e004
@@@ -54,8 -53,7 +53,9 @@@ from .onionstudios import OnionStudiosI
  from .snagfilms import SnagFilmsEmbedIE
  from .screenwavemedia import ScreenwaveMediaIE
  from .mtv import MTVServicesEmbeddedIE
 +from .pladform import PladformIE
 +from .googledrive import GoogleDriveIE
+ from .jwplatform import JWPlatformIE
  
  
  class GenericIE(InfoExtractor):