aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/__init__.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2012-11-27 17:14:29 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2012-11-27 17:14:29 +0100
commit33d94a6c999ae784be7529aaaea42adadeab0c27 (patch)
tree46fbbbbbeaef770bee2d7ed50ed3e84a23a604ed /youtube_dl/__init__.py
parent4d47921c9e848fceb6c475e01112e758ff9d1289 (diff)
parent2ebc6e6a92ae7dd7cdc281f3cf402a031ba6aa03 (diff)
Merge remote-tracking branch 'alab1001101/master'
Diffstat (limited to 'youtube_dl/__init__.py')
-rw-r--r--youtube_dl/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 92478aa6b..f7a49e13a 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -367,7 +367,7 @@ def gen_extractors():
YoukuIE(),
XNXXIE(),
GooglePlusIE(),
-
+ ArteTvIE(),
GenericIE()
]