]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Lyberta/RandomItems' into Lyberta/PlayerTemplates
authorLyberta <lyberta@lyberta.net>
Thu, 9 Nov 2017 16:32:43 +0000 (19:32 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 9 Nov 2017 16:32:43 +0000 (19:32 +0300)

Trivial merge