Merge branch 'master' into master

2017-06-23 10:00:11 +12:00
parent af699006c7 9b9492f14b
commit 0877052a13
3805 changed files with 159818 additions and 137159 deletions
--- a/3
+++ b/3
@@ -4,6 +4,7 @@
 #OPENVPN_USERNAME=
 #OPENVPN_PASSWORD=
 #LOCAL_NETWORK=
+#ENABLE_UFW=false
 #TRANSMISSION_ALT_SPEED_DOWN=50 
 #TRANSMISSION_ALT_SPEED_ENABLED=false 
 #TRANSMISSION_ALT_SPEED_TIME_BEGIN=540 
@@ -77,4 +78,4 @@
 #TRANSMISSION_WATCH_DIR_ENABLED=true 
 #TRANSMISSION_HOME=/data/transmission-home
 #WEBPROXY_ENABLED=true
-#WEBPROXY_PORT=8888
+#WEBPROXY_PORT=8888