From: Mario <mario.mario@y7mail.com>
Date: Wed, 25 Sep 2019 23:54:08 +0000 (+0000)
Subject: Merge branch 'martin-t/vbots' into 'master'
X-Git-Tag: xonotic-v0.8.5~1275
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0fbec9b102b96688c9e3651bab374de1d39990cb;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/vbots' into 'master'

Add bots and nobots votes, set default bot skill to 8 (from 1)

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

0fbec9b102b96688c9e3651bab374de1d39990cb