]> 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: e3dc3ca b5d1145)
Merge branch 'pending-release' into 'master'
authorbones_was_here <bones_was_here@xonotic.au>
Sun, 28 May 2023 05:32:20 +0000 (05:32 +0000)
committerbones_was_here <bones_was_here@xonotic.au>
Sun, 28 May 2023 05:32:20 +0000 (05:32 +0000)
Merge pending-release into master

Closes #204

See merge request xonotic/xonotic-maps.pk3dir!171


Trivial merge