diff options
author | Maximilian Hils <git@maximilianhils.com> | 2016-06-19 18:27:12 -0700 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2016-06-19 18:27:12 -0700 |
commit | 165deb08fdb8225c8e2fea6c6025aa6534a4c771 (patch) | |
tree | ab5996776db6445dcfb152bec901142a467b9cb3 /tox.ini | |
parent | c4c9527fa0ff2cc9299082321845739261f41f8f (diff) | |
parent | d01e49c6d5e474700956a9b7f1171a4229bfa750 (diff) | |
download | mitmproxy-165deb08fdb8225c8e2fea6c6025aa6534a4c771.tar.gz mitmproxy-165deb08fdb8225c8e2fea6c6025aa6534a4c771.tar.bz2 mitmproxy-165deb08fdb8225c8e2fea6c6025aa6534a4c771.zip |
Merge remote-tracking branch 'jason/settings'
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions