From: Martin Taibr <taibr.martin@gmail.com>
Date: Mon, 9 Dec 2019 11:08:08 +0000 (+0100)
Subject: Merge branch 'master' into martin-t/linkexplode
X-Git-Tag: xonotic-v0.8.5~1105^2~15^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=79fca1be297e3cf7b890dda6daa85b6a7779c28f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into martin-t/linkexplode
---

79fca1be297e3cf7b890dda6daa85b6a7779c28f