| commit | c651a62cc2ab9f099f988e415228e20fbfa4255b | |
| author | Stefan Kögl <stefan@skoegl.net> | |
| Mon, 26 Nov 2012 17:15:57 +0000 (26 18:15 +0100) | ||
| committer | Stefan Kögl <stefan@skoegl.net> | |
| Mon, 26 Nov 2012 17:15:57 +0000 (26 18:15 +0100) | ||
| tree | 17e0758136f1e169e4eeac3962265c5cb8a9ebae | treesnapshot (tar.gz zip) |
| parent | ddff3c6b130e56364427fb296336ae6323a1ac7c | commitdiff |
| parent | a70d9d48d432dad5e3dd09017b20264a53acfc79 | commitdiff |
Merge branch 'master' into flattr
Conflicts:
mygpo/users/models.py
Conflicts:
mygpo/users/models.py
| mygpo/users/models.py | diff1 | diff2 | blobhistory |
| mygpo/web/templates/episode.html | diff1 | diff2 | blobhistory |
| mygpo/web/urls.py | diff1 | diff2 | blobhistory |
| mygpo/web/views/episode.py | diff1 | diff2 | blobhistory |