]> 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: 82d2e1e bab35c7)
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 27 Mar 2020 09:12:51 +0000 (10:12 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 27 Mar 2020 09:12:51 +0000 (10:12 +0100)

Trivial merge