]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/PlayerTemplates
authorLyberta <lyberta@lyberta.net>
Sat, 17 Feb 2018 16:36:56 +0000 (19:36 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 17 Feb 2018 16:36:56 +0000 (19:36 +0300)
commit3190da33db656f8ea62992efd9cdbca669dd8aff
tree2e6fa33158877c77a2daa9ce86d342f0641d516b
parent9a75d97de750f0541463fcbc07c60db7a3a6c325
parentbcfb2c28a83d43a76cdc18de1f00b4d191da55e5
Merge branch 'master' into Lyberta/PlayerTemplates