]> 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: f6dc194 a34c7d6)
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)

Trivial merge