diff options
| author | Clemens <cle1000.cb@gmail.com> | 2016-07-19 12:32:36 +0200 |
|---|---|---|
| committer | Clemens <cle1000.cb@gmail.com> | 2016-07-19 12:32:36 +0200 |
| commit | 698fb11132598a38851383f805dde5ca4d2a046d (patch) | |
| tree | 95fc0184735722ccd6e4697f884496d6852e13f6 /.python-version | |
| parent | 48728af43ad746d70ef3e251dc28b75028dea1e6 (diff) | |
| parent | 18dd84b9081fb5552d5b5b2560405496445e2110 (diff) | |
| download | mitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.tar.gz mitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.tar.bz2 mitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.zip | |
Merge remote-tracking branch 'origin/master' into flow_editing
Diffstat (limited to '.python-version')
| -rw-r--r-- | .python-version | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.python-version b/.python-version deleted file mode 100644 index 2339c8bf..00000000 --- a/.python-version +++ /dev/null @@ -1,2 +0,0 @@ -2.7.11 -3.5.1 |