]> 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: 044989a 6aa821a)
Merge branch 'master' into Lyberta/FixJoinBestTeam
authorLyberta <lyberta@lyberta.net>
Wed, 25 Jul 2018 15:48:20 +0000 (18:48 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 25 Jul 2018 15:48:20 +0000 (18:48 +0300)

Trivial merge