From: Mario <mario.mario@y7mail.com>
Date: Mon, 20 Apr 2020 13:20:42 +0000 (+0000)
Subject: Merge branch 'Spike29/testing_settemp' into 'master'
X-Git-Tag: xonotic-v0.8.5~1101
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=173bc7776de3bf48f64d1454cc3e08d96970b5ea;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Spike29/testing_settemp' into 'master'

Add a missing settemp in the test_blaster_switch vote

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

173bc7776de3bf48f64d1454cc3e08d96970b5ea