]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Tue, 22 Aug 2017 22:16:47 +0000 (01:16 +0300)
committerLyberta <lyberta@lyberta.net>
Tue, 22 Aug 2017 22:16:47 +0000 (01:16 +0300)
commit1dbeb65af71dc4bce90503504bfb307883444a43
tree4aaf2e5d45f95328faca46846e571c7624164649
parentf982d7d13bd0a38d06f4f9d9dcf90adf2606be3e
parent609cf58b4058559025fc5fb09044e11851609182
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival