]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/PlayerTemplates
authorLyberta <lyberta@lyberta.net>
Mon, 8 Jan 2018 16:06:59 +0000 (19:06 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 8 Jan 2018 16:06:59 +0000 (19:06 +0300)
commit8da02d961e26c65af143ae321d0ea78201983c04
tree2267e4454be1de5aaf0c207795845758da8e6dd1
parent7f2bb7338d5d245136c85288190857a1583e9f6d
parent592256dcbdd52ee36778295ce0be2c5a568f6fc6
Merge branch 'master' into Lyberta/PlayerTemplates