Merge branch 'master' into martin-t/example-config
authorMartin Taibr <taibr.martin@gmail.com>
Wed, 21 Feb 2018 09:42:34 +0000 (10:42 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Wed, 21 Feb 2018 09:42:34 +0000 (10:42 +0100)
1  2 
server/server.cfg

Simple merge