From: Mario <mario.mario@y7mail.com>
Date: Wed, 8 Jul 2020 15:37:16 +0000 (+0000)
Subject: Merge branch 'bones_was_here/mv-r_water-acl' into 'master'
X-Git-Tag: xonotic-v0.8.5~893
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=be996f9b9d67ebbb153442b7e077253de6da798c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'bones_was_here/mv-r_water-acl' into 'master'

Allow mappers to set r_water and server admins to add mapinfo ACLs

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

be996f9b9d67ebbb153442b7e077253de6da798c