Merge branch 'master' into terencehill/bot_ai
authorterencehill <piuntn@gmail.com>
Sat, 14 Mar 2020 22:41:28 +0000 (23:41 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 14 Mar 2020 22:41:28 +0000 (23:41 +0100)
1  2 
xonotic-server.cfg

Simple merge