From: Lyberta <lyberta@lyberta.net>
Date: Mon, 19 Mar 2018 15:58:09 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/GiveResourceWithLimit
X-Git-Tag: xonotic-v0.8.5~2204^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=049a2f7339dd6bdd1bb1cfada4aba1ae8c6c5c6d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Lyberta/GiveResourceWithLimit
---

049a2f7339dd6bdd1bb1cfada4aba1ae8c6c5c6d