Merge remote-tracking branch 'naglis/sockshare'

Conflicts: youtube_dl/extractor/__init__.py
2014-07-21 13:24:15 +02:00
parent df8ba0d2cf 66aa382eae
commit 7dabd2ac45
2 changed files with 78 additions and 0 deletions
--- a/youtube_dl/extractor/init.py
+++ b/youtube_dl/extractor/init.py
@@ -268,6 +268,7 @@ from .smotri import (
    SmotriBroadcastIE,
 )
 from .snotr import SnotrIE
+from .sockshare import SockshareIE
 from .sohu import SohuIE
 from .soundcloud import (
    SoundcloudIE,