summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-10-28 09:13:23 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-10-28 09:13:23 +0100
commit68acdbda9d940da63a6e8c59e3292313cf07bdf5 (patch)
treea02c7ebab53f9de06aea0d2ee7e03e36a9140207
parent27c542c06f816100a64a2e3dbc5396df033aa025 (diff)
parentaaa399d2f6cf8efff6e63f05be947c6ee4de4d34 (diff)
downloadyoutube-dl-68acdbda9d940da63a6e8c59e3292313cf07bdf5.tar.gz
youtube-dl-68acdbda9d940da63a6e8c59e3292313cf07bdf5.tar.xz
youtube-dl-68acdbda9d940da63a6e8c59e3292313cf07bdf5.zip
Merge remote-tracking branch 'origin/master'
-rw-r--r--docs/conf.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 4a04ad779..594ca61a6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -44,8 +44,8 @@ copyright = u'2014, Ricardo Garcia Gonzalez'
 # built documents.
 #
 # The short X.Y version.
-import youtube_dl
-version = youtube_dl.__version__
+from youtube_dl.version import __version__
+version = __version__
 # The full version, including alpha/beta/rc tags.
 release = version