From: Mario <mario@smbclan.net>
Date: Sat, 7 Sep 2019 06:25:34 +0000 (+1000)
Subject: Merge branch 'Mario/warmup_end_hook'
X-Git-Tag: xonotic-v0.8.5~1311
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=43737a98663dada49d0d618bf828a1d17bb18000;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/warmup_end_hook'
---

43737a98663dada49d0d618bf828a1d17bb18000