From: Spike29 <leguen.yannick@gmail.com>
Date: Sat, 1 Jun 2019 11:19:22 +0000 (+0200)
Subject: Merge branch 'master' into Spike29/tutorial_campaign
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=92cbe2f53aff86dde036f209021e36a9059c3279;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into Spike29/tutorial_campaign
---

92cbe2f53aff86dde036f209021e36a9059c3279