]> 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: 1ea9a8b 4431da0)
Merge branch 'Mario/glowy_skins' into 'develop'
authorMario <mario.mario@y7mail.com>
Fri, 6 Nov 2020 15:19:36 +0000 (15:19 +0000)
committerMario <mario.mario@y7mail.com>
Fri, 6 Nov 2020 15:19:36 +0000 (15:19 +0000)
Merge branch Mario/glowy_skins (XS merge request)

See merge request xonotic/xonotic-data.pk3dir!857


Trivial merge