]> git.xonotic.org Git - xonotic/xonstat.git/commit
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)
commit95d2b357c80923a0d9192d218cf26be94dbff134
tree47f9b47c6d39d619cd04140dce2ec125647af360
parentcc00938d1c953602036819700c8fc3a5f2b1fa67
parent933197b9e4a03c2a67b72c8cfc57b21c96677116
Merge conflict fix.
xonstat/models.py