From: bones_was_here <bones_was_here@xa.org.au>
Date: Sat, 18 Jun 2022 14:54:03 +0000 (+0000)
Subject: Merge branch 'bones_was_here/805' into 'master'
X-Git-Tag: xonotic-v0.8.5~4
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=480de525d9378ac5baa42568c212dc6b13363879;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'bones_was_here/805' into 'master'

Increase Xonotic version to 0.8.5

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

480de525d9378ac5baa42568c212dc6b13363879