Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic.wiki
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 20 Oct 2017 13:11:54 +0000 (15:11 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 20 Oct 2017 13:11:54 +0000 (15:11 +0200)
commit68df2def9842215c889966eac3897af83470e8bd
tree8cc6414c88b52603ac710eb57b1c6f5d2ebff03b
parent597a3a54e9500faf54d0a66f18b9ab095500eb0b
parenta6ef10bf17bf1bf0586bde72145d5d6627ef84e8
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic.wiki
assets/check-and-fix.py