]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Thu, 1 Jun 2017 10:15:17 +0000 (13:15 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 1 Jun 2017 10:15:17 +0000 (13:15 +0300)
commit5f37f88eedf8daaa085282850dd1154b75814168
treeddb05aa3474253a114a77688691b49f529dffcd4
parent09e293017591a969715636b12a1afdb279f84cd8
parent89508e151b28b8b79f50dd7d834c5bb856c9cd24
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival