From: Mario <mario.mario@y7mail.com>
Date: Mon, 20 Jan 2020 22:42:55 +0000 (+0000)
Subject: Merge branch 'bones_was_here/flaglights' into 'master'
X-Git-Tag: xonotic-v0.8.5~1161^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=44392b8899389709ee28e3a762dc0d72c23871dd;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'bones_was_here/flaglights' into 'master'

Add description for g_ctf_dynamiclights and whitelist

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

44392b8899389709ee28e3a762dc0d72c23871dd