diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-06-12 11:27:16 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-12 11:27:16 +1200 |
| commit | e58a2bf0956c6916ebba2477df0320b554c139e2 (patch) | |
| tree | 83934cad2a5918fd7b22a7236985356dfc9cced3 /docs/conf.py | |
| parent | dc545ca0f63b63c88dd5bf5d072a3d9b5cc2a2ea (diff) | |
| parent | 1d4403096393369e0a8038ad79434ac26b503de3 (diff) | |
| download | mitmproxy-e58a2bf0956c6916ebba2477df0320b554c139e2.tar.gz mitmproxy-e58a2bf0956c6916ebba2477df0320b554c139e2.tar.bz2 mitmproxy-e58a2bf0956c6916ebba2477df0320b554c139e2.zip | |
Merge branch 'master' into appveyor
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/conf.py b/docs/conf.py index 3ef0c63d..ae657435 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -21,7 +21,7 @@ import shlex # documentation root, use os.path.abspath to make it absolute, like shown here. sys.path.insert(0, os.path.abspath('..')) -import mitmproxy.version +import netlib.version # -- General configuration ------------------------------------------------ @@ -69,9 +69,9 @@ author = u'The mitmproxy project' # built documents. # # The short X.Y version. -version = mitmproxy.version.VERSION +version = netlib.version.VERSION # The full version, including alpha/beta/rc tags. -release = mitmproxy.version.VERSION +release = netlib.version.VERSION # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |