From: SpiKe <leguen.yannick@gmail.com>
Date: Fri, 17 Jun 2022 08:50:46 +0000 (+0000)
Subject: Merge branch 'Mirio/opium' into 'master'
X-Git-Tag: xonotic-v0.8.5~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=034d4e842a5b487ea44458dd211b0dddfc252d4b;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Mirio/opium' into 'master'

Mirio/opium

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

034d4e842a5b487ea44458dd211b0dddfc252d4b