]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/freezetag_updates 896/head
authorterencehill <piuntn@gmail.com>
Wed, 5 May 2021 13:14:59 +0000 (15:14 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 5 May 2021 13:14:59 +0000 (15:14 +0200)
commit68b050a0b548bba714d11ebef05b414413c9bd04
treeca7be1683b37d1cf0cbf54e575f86d3e1d599301
parentbfe584e92dc3b08a38276cd8d9314024e927573b
parent0b6e5d1712c75440273ee5d34d24186867e09c94
Merge branch 'master' into terencehill/freezetag_updates

# Conflicts:
# gamemodes-server.cfg
gamemodes-server.cfg