From: Lyberta <lyberta@lyberta.net>
Date: Sat, 31 Mar 2018 05:29:03 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/GiveResourceWithLimit
X-Git-Tag: xonotic-v0.8.5~2204^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=480a83dcd9c56a567d48f9925528d23563bb1fc1;p=xonotic%2Fxonotic-data.pk3dir.git

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

480a83dcd9c56a567d48f9925528d23563bb1fc1