]> 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: 4ba3bb5 4652cac)
Merge branch 'Mirio/space-elevator' into 'master'
authorSpiKe <leguen.yannick@gmail.com>
Fri, 17 Jun 2022 08:42:47 +0000 (08:42 +0000)
committerSpiKe <leguen.yannick@gmail.com>
Fri, 17 Jun 2022 08:42:47 +0000 (08:42 +0000)
Mirio/space-elevator

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


Trivial merge