]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 446924d f17ba25)
Merge branch 'master' into Juhu/strafehud-server
authorJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Thu, 18 Mar 2021 14:13:00 +0000 (15:13 +0100)
committerJuhu <5894800-Juhu_@users.noreply.gitlab.com>
Thu, 18 Mar 2021 14:13:00 +0000 (15:13 +0100)

Trivial merge