]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1bc23ac 494f3c2)
Merge branch 'master' into pending-release
authorSpike29 <leguen.yannick@gmail.com>
Mon, 5 Sep 2022 20:34:18 +0000 (22:34 +0200)
committerSpike29 <leguen.yannick@gmail.com>
Mon, 5 Sep 2022 20:34:18 +0000 (22:34 +0200)

Trivial merge