aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/__init__.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2015-02-16 04:44:28 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2015-02-16 04:44:28 +0100
commitbfa6bdcd8b3d8503a472dc6884032f26604271c9 (patch)
tree333f58edea1c853cb4b53bb34339f82733d20322 /youtube_dl/extractor/__init__.py
parent03cd72b0070c430e95b7e9d612afcad026690153 (diff)
parent7105440cecf82aff295df4f32575f6c8b64b3c2d (diff)
Merge remote-tracking branch 'yan12125/IE_Yam'
Diffstat (limited to 'youtube_dl/extractor/__init__.py')
-rw-r--r--youtube_dl/extractor/__init__.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 13292073c..5b776a7a1 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -579,6 +579,7 @@ from .yahoo import (
YahooIE,
YahooSearchIE,
)
+from .yam import YamIE
from .yesjapan import YesJapanIE
from .ynet import YnetIE
from .youjizz import YouJizzIE