From: SpiKe <leguen.yannick@gmail.com>
Date: Fri, 17 Jun 2022 08:41:10 +0000 (+0000)
Subject: Merge branch 'cortez/finalrage' into 'master'
X-Git-Tag: xonotic-v0.8.5~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4ba3bb52fb8aa094d2630fa4a4389a211b19769c;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'cortez/finalrage' into 'master'

cortez/finalrage

Closes #179, #178, and #177

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

4ba3bb52fb8aa094d2630fa4a4389a211b19769c