]> 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: 02cfcd8 b7d363a)
Merge branch 'TimePath/bot_api'
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 7 Aug 2016 04:49:39 +0000 (14:49 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 7 Aug 2016 04:49:39 +0000 (14:49 +1000)

Trivial merge