]> 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: f98613d fc3a0c6)
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 12 Apr 2020 17:56:44 +0000 (19:56 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 12 Apr 2020 17:56:44 +0000 (19:56 +0200)

Trivial merge