]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/PlayerTemplates
authorLyberta <lyberta@lyberta.net>
Fri, 8 Jun 2018 15:00:19 +0000 (18:00 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 8 Jun 2018 15:00:19 +0000 (18:00 +0300)
commit71af4abf333f19089a32b538b7d1b8abd8f653c6
treef75434038b7b69c7aa20d95e4c3b59869dbf0597
parent8ff82c71df24d3ac6e42664a8ad246df579ace0e
parentfec3553d563f8e67ad36db1da3fe3e8c430d4d9c
Merge branch 'master' into Lyberta/PlayerTemplates