From: Martin Taibr <taibr.martin@gmail.com>
Date: Sat, 29 Sep 2018 17:39:04 +0000 (+0000)
Subject: Merge branch 'Mario/bot_maxplayers' into 'master'
X-Git-Tag: xonotic-v0.8.5~1816
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=95da641845d520e3f59e5d47f418859a60704de7;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/bot_maxplayers' into 'master'

Merge branch Mario/bot_maxplayers (XXS merge request)

See merge request xonotic/xonotic-data.pk3dir!601
---

95da641845d520e3f59e5d47f418859a60704de7