aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-12-05 15:55:43 +1300
committerAldo Cortesi <aldo@nullcube.com>2016-12-08 10:21:06 +1300
commitd742d4fb8c8d601c19f7aa5ff746a4167d864f7e (patch)
tree7cac08c95870f5ef9f1263d77cc4d80736b1bdaf /.gitignore
parent6aacd27ab26e6831ad6f9cfe0b1f555617321a25 (diff)
downloadmitmproxy-d742d4fb8c8d601c19f7aa5ff746a4167d864f7e.tar.gz
mitmproxy-d742d4fb8c8d601c19f7aa5ff746a4167d864f7e.tar.bz2
mitmproxy-d742d4fb8c8d601c19f7aa5ff746a4167d864f7e.zip
Replace configargparse with argparse, enable new options loading
This commit ditches configargparse and enables the new config file format. The default location is ~/.mitmproxy/config.yaml. Unifying all of the various Options objects will follow in the next patch.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index e942ea94..91caf620 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
.DS_Store
MANIFEST
-*/tmp
+**/tmp
/venv*
*.py[cdo]
*.swp