]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/PlayerTemplates Lyberta/PlayerTemplates
authorLyberta <lyberta@lyberta.net>
Wed, 22 Aug 2018 10:36:03 +0000 (13:36 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 22 Aug 2018 10:36:03 +0000 (13:36 +0300)
commit9989aca77459e9bd305c86d71b1b6912ebca9a4e
treefde86124d01b41d5f7a72a0741d07f7f24104dae
parentf6dc194f6394a97881b890a7f07eadd60e00591e
parenta34c7d612200ef8fe04cb9649061b2e4b6fc5703
Merge branch 'master' into Lyberta/PlayerTemplates