]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
Merge branch 'master' into pending-release, fix a merge conflict on maps/opium.mapinfo
authorSpike29 <leguen.yannick@gmail.com>
Wed, 28 Aug 2024 09:58:19 +0000 (11:58 +0200)
committerSpike29 <leguen.yannick@gmail.com>
Wed, 28 Aug 2024 09:58:19 +0000 (11:58 +0200)
1  2 
maps/opium.mapinfo

Simple merge