Merge branch 'master' into martin-t/example-config 35/head
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 23 Feb 2018 22:26:32 +0000 (23:26 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 23 Feb 2018 22:26:32 +0000 (23:26 +0100)
commit1a0ff870ff6b234747a81dd669d18d463e802cb9
treed636821c9e4c94a012b451218d5ff5b2b5ba2f81
parenta7802f7b2ca019ac43f3e2276788ae92540d1003
parent398e5df70cd2b267accdd8d761b65afb7fdfb2ea
Merge branch 'master' into martin-t/example-config
server/server.cfg