Merge branch 'edge' of http://10.6.6.2/zerotier/zerotierone into edge

This commit is contained in:
Joseph Henry 2015-12-15 15:57:02 -08:00
commit 011ce35ede

View File

@ -83,7 +83,7 @@ Now you can run an application inside your network container.
export LD_PRELOAD=`pwd`/libzerotierintercept.so
export ZT_NC_NETWORK=/tmp/netcon-test-home/nc_8056c2e21c000001
python -m SimpleHTTPServer 80
python -m SimpleHTTPServer
(If you are using Python 3, use "-m http.server".)