From: Mario <zacjardine@y7mail.com>
Date: Thu, 1 Jun 2017 17:22:55 +0000 (+0000)
Subject: Merge branch 'Lyberta/f1time' into 'master'
X-Git-Tag: xonotic-v0.8.5~2743
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3164becbc3174972d8388d92fb5e8f45e4b20571;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Lyberta/f1time' into 'master'

Made f1time be handled on the server too.

See merge request !444
---

3164becbc3174972d8388d92fb5e8f45e4b20571