From: Lyberta <lyberta@lyberta.net>
Date: Tue, 27 Mar 2018 23:08:52 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/GiveResourceWithLimit
X-Git-Tag: xonotic-v0.8.5~2204^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1e0dbeb759a0189ef6938a3193ec60a6a8ca6434;p=xonotic%2Fxonotic-data.pk3dir.git

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

1e0dbeb759a0189ef6938a3193ec60a6a8ca6434