Merge branch 'master' into nxdn

This commit is contained in:
Jonathan Naylor
2018-02-08 20:50:18 +00:00
26 changed files with 266 additions and 755 deletions

View File

@@ -131,8 +131,7 @@ Debug=0
Enable=1
Address=44.131.4.1
Port=62031
JitterEnabled=0
Jitter=500
Jitter=300
# Local=62032
Password=PASSWORD
# Options=