]> git.xonotic.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc00938 933197b)
Merge conflict fix.
authorAnt Zucaro <azucaro@gmail.com>
Thu, 12 Jan 2012 17:49:03 +0000 (12:49 -0500)
committerAnt Zucaro <azucaro@gmail.com>
Thu, 12 Jan 2012 17:49:03 +0000 (12:49 -0500)
1  2 
xonstat/models.py patch | diff1 | diff2 | blob | history

diff --cc xonstat/models.py
Simple merge