From: Mario <mario.mario@y7mail.com>
Date: Thu, 9 Dec 2021 05:47:55 +0000 (+0000)
Subject: Merge branch 'Mario/lms_pickup_items' into 'master'
X-Git-Tag: xonotic-v0.8.5~271
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3f520f2d63abbf71b1953b7ffc23d7cb30910dd6;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/lms_pickup_items' into 'master'

Merge branch Mario/lms_pickup_items (XXS merge request)

See merge request xonotic/xonotic-data.pk3dir!934
---

3f520f2d63abbf71b1953b7ffc23d7cb30910dd6