From: SpiKe <leguen.yannick@gmail.com>
Date: Wed, 29 Mar 2023 08:03:49 +0000 (+0000)
Subject: Merge branch 'proraide/trident' into 'pending-release'
X-Git-Tag: xonotic-v0.8.6~22^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2d806269b05f4b4e0495fefe47d0f67afe90fae2;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'proraide/trident' into 'pending-release'

Add trident map

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

2d806269b05f4b4e0495fefe47d0f67afe90fae2