From: Spike29 <leguen.yannick@gmail.com>
Date: Mon, 26 Aug 2019 08:56:51 +0000 (+0200)
Subject: Merge branch 'master' into Spike29/tutorial_campaign
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1c2eecf44f2532b7d59c012b526bdd64e7742796;p=xonotic%2Fxonotic-maps.pk3dir.git

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

1c2eecf44f2532b7d59c012b526bdd64e7742796