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 /setup.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 'setup.py')
| -rw-r--r-- | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -7,7 +7,7 @@ import os here = os.path.abspath(os.path.dirname(__file__)) -from mitmproxy import version +from netlib import version with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f: long_description = f.read() |