aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-01-09 18:06:22 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-01-09 18:06:22 +0100
commit7e4f28e82a963194af2315945de937eb140684dd (patch)
treeda76e2c52ad0633c6e2ca2765f60e9c2d8010e17
parentd0a6d2e2545089893d3789e3c787e269645df852 (diff)
parent85e09278209af88d081e2cbc8002bd6defb624f4 (diff)
downloadmitmproxy-7e4f28e82a963194af2315945de937eb140684dd.tar.gz
mitmproxy-7e4f28e82a963194af2315945de937eb140684dd.tar.bz2
mitmproxy-7e4f28e82a963194af2315945de937eb140684dd.zip
Merge branch 'master' into tcp_proxy
-rw-r--r--README.mkd2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.mkd b/README.mkd
index f3516faf..f0a26dd5 100644
--- a/README.mkd
+++ b/README.mkd
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/mitmproxy/netlib.png)](https://travis-ci.org/mitmproxy/netlib) [![Coverage Status](https://coveralls.io/repos/mitmproxy/netlib/badge.png)](https://coveralls.io/r/mitmproxy/netlib)
+[![Build Status](https://travis-ci.org/mitmproxy/netlib.png?branch=master)](https://travis-ci.org/mitmproxy/netlib) [![Coverage Status](https://coveralls.io/repos/mitmproxy/netlib/badge.png?branch=master)](https://coveralls.io/r/mitmproxy/netlib)
Netlib is a collection of network utility classes, used by the pathod and
mitmproxy projects. It differs from other projects in some fundamental