aboutsummaryrefslogtreecommitdiffstats
path: root/README.rst
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-06-03 10:19:22 +1200
committerAldo Cortesi <aldo@nullcube.com>2016-06-03 10:19:22 +1200
commitc6d15904f3e3a54690637990525da0b53ff1e299 (patch)
treeacabc150ed24f601bff293587d327c26557c43fe /README.rst
parent5fd52970fd30f00d7a7e6ebfb6ce0d4d03942ed3 (diff)
parentb9ad7be5ac3c33970a3a4cb1829108f1cdfda12e (diff)
downloadmitmproxy-c6d15904f3e3a54690637990525da0b53ff1e299.tar.gz
mitmproxy-c6d15904f3e3a54690637990525da0b53ff1e299.tar.bz2
mitmproxy-c6d15904f3e3a54690637990525da0b53ff1e299.zip
Merge remote-tracking branch 'upstream/master' into testsuite
Diffstat (limited to 'README.rst')
-rw-r--r--README.rst7
1 files changed, 7 insertions, 0 deletions
diff --git a/README.rst b/README.rst
index 8b7ebbda..85663fc5 100644
--- a/README.rst
+++ b/README.rst
@@ -33,6 +33,13 @@ You can join our developer chat on Slack.
|slack|
+Installation
+------------
+
+The installation instructions are `here <http://docs.mitmproxy.org/en/stable/install.html>`_.
+If you want to contribute changes, see the section on hacking.
+
+
Hacking
-------