]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b214b2 8da02d9)
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Mon, 8 Jan 2018 16:08:44 +0000 (19:08 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 8 Jan 2018 16:08:44 +0000 (19:08 +0300)

Trivial merge