Merge branch 'tvpleextractor' of github.com:kjy00302/youtube-dl into tvpleextractor

Conflicts:
	youtube_dl/extractor/tvple.py
This commit is contained in:
kjy00302 2015-12-01 01:06:07 +09:00
commit 129f0d9cfd

View File

@ -93,6 +93,7 @@
- **Clipsyndicate** - **Clipsyndicate**
- **Cloudy** - **Cloudy**
- **Clubic** - **Clubic**
- **Clyp**
- **cmt.com** - **cmt.com**
- **CNET** - **CNET**
- **CNN** - **CNN**