]> git.xonotic.org Git - xonotic/xonstat.git/commit
Add actual merge functionality.
authorAnt Zucaro <azucaro@gmail.com>
Wed, 18 Jun 2014 01:04:39 +0000 (21:04 -0400)
committerAnt Zucaro <azucaro@gmail.com>
Wed, 18 Jun 2014 01:04:39 +0000 (21:04 -0400)
commitce16b0e45a6788a3728f9650af4c586fd95673a1
treea3e3787efc958d0d82ef09064a9e175fbfc83864
parent93d3156461c36795e546d686c1d2c962eb3e7897
Add actual merge functionality.
xonstat/templates/merge.mako
xonstat/views/admin.py