Merge remote-tracking branch 'mitmproxy/master'

Merge with master
2024-11-23 08:11:00 +00:00 · 2016-03-28 10:06:02 -07:00 · 2016-03-28 10:06:02 -07:00 · 37483e228f
commit 37483e228f
parent 6d16f44ab7
1 changed files with 0 additions and 1 deletions
--- a/test/mitmproxy/test_flow_export.py
+++ b/test/mitmproxy/test_flow_export.py
@ -391,4 +391,3 @@ class TestIsJson():
        headers = Headers(content_type="application/json")
        j = flow_export.is_json(headers, '{"name": "example", "email": "example@example.com"}')
        assert isinstance(j, dict)
-