]> git.rm.cloudns.org Git - xonotic/xonstat.git/commitdiff
Merge branch 'master' into zykure/approved
authorJan Behrens <zykure@web.de>
Sun, 21 Apr 2013 20:47:57 +0000 (22:47 +0200)
committerJan Behrens <zykure@web.de>
Sun, 21 Apr 2013 20:47:57 +0000 (22:47 +0200)
1  2 
xonstat/templates/map_info.mako
xonstat/templates/server_info.mako

Simple merge
Simple merge