| commit | 5393aa40b2081e3a96bc3601b92ec16fd46ab0ef | |
| author | Stefan Koegl <stefan@skoegl.net> | |
| Sat, 30 Jan 2010 16:12:02 +0000 (30 17:12 +0100) | ||
| committer | Stefan Koegl <stefan@skoegl.net> | |
| Sat, 30 Jan 2010 16:12:02 +0000 (30 17:12 +0100) | ||
| tree | eba0de1a786b1b5e701ccf3114c3480620ba9a19 | treesnapshot (tar.gz zip) |
| parent | eff1b94b60f93062859dd83b092f9244339fe2e8 | commitdiff |
| parent | bf197bc166b1d7c3b995d85490e1b118d070d9b3 | commitdiff |
Merge branch 'master' of dgpo:~martin/mygpo-src
Conflicts:
mygpo/web/templates/toplist.html
Conflicts:
mygpo/web/templates/toplist.html