]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 866e651 177a587)
Merge branch 'terencehill/banning_stuff'
authorterencehill <piuntn@gmail.com>
Fri, 9 Jun 2023 15:16:43 +0000 (17:16 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 9 Jun 2023 15:16:43 +0000 (17:16 +0200)

Trivial merge