]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 17:59:21 +0000 (20:59 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 17:59:21 +0000 (20:59 +0300)
commit9b214b224ab7c2e4347af0ad05e431293e82e37b
treeb09e2e729a69086d43026028cdd331ebe3f5a0ad
parent49788d5b763cee217d76a2078e96e51e6049078c
parent7f2bb7338d5d245136c85288190857a1583e9f6d
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival