| commit | b4819c0a8d766870985fbcac9c1ccf842bc94083 | |
| author | Stefan Koegl <stefan@skoegl.net> | |
| Tue, 26 Jan 2010 18:35:33 +0000 (26 19:35 +0100) | ||
| committer | Stefan Koegl <stefan@skoegl.net> | |
| Tue, 26 Jan 2010 18:35:33 +0000 (26 19:35 +0100) | ||
| tree | fb6c84276f5909862371bb3964571a86191260c6 | treesnapshot (tar.gz zip) |
| parent | ee4e4f8fc505326c9de6e726ba117c965428086e | commitdiff |
| parent | f82b8e0c339028549908e852b202a9abdb8f245e | commitdiff |
Merge branch 'master' of dgpo:~armin/mygpo-src
Conflicts:
mygpo/web/views.py
Conflicts:
mygpo/web/views.py
| mygpo/web/views.py | diff1 | diff2 | blobhistory |