From: Lyberta <lyberta@lyberta.net>
Date: Wed, 16 Aug 2017 00:17:03 +0000 (+0300)
Subject: Merge branch 'Lyberta/GivePlayerAmmo' into Lyberta/PlayerTemplates
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=648ba1e6bd4b0a0b1e17a7eca6d8ecf8d0b603fa;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Lyberta/GivePlayerAmmo' into Lyberta/PlayerTemplates
---

648ba1e6bd4b0a0b1e17a7eca6d8ecf8d0b603fa