]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e2a87d e5cb29a)
Merge branch 'master' into pending-release
authorSpike29 <leguen.yannick@gmail.com>
Tue, 15 Aug 2023 14:03:37 +0000 (16:03 +0200)
committerSpike29 <leguen.yannick@gmail.com>
Tue, 15 Aug 2023 14:03:37 +0000 (16:03 +0200)

Trivial merge