Merge branch 'master' into Lyberta/TeamplayOverhaul2
authorLyberta <lyberta@lyberta.net>
Wed, 22 Aug 2018 10:32:08 +0000 (13:32 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 22 Aug 2018 10:32:08 +0000 (13:32 +0300)
commitfff62730123df4a2ef92904bc24d2520518e4e7f
treec6368feacf082ec7872c8b5cd800416ce415b57f
parent677328b0b1e53bdd5868d5020d2f7e52cf8c2d42
parenta34c7d612200ef8fe04cb9649061b2e4b6fc5703
Merge branch 'master' into Lyberta/TeamplayOverhaul2
xonotic-server.cfg