]> 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: 736282f 624f561)
Merge branch 'master' into pending-release
authorSpike29 <leguen.yannick@gmail.com>
Sun, 21 May 2023 12:13:05 +0000 (14:13 +0200)
committerSpike29 <leguen.yannick@gmail.com>
Sun, 21 May 2023 12:13:05 +0000 (14:13 +0200)

Trivial merge