| commit | 35931c1893120012273b9e1949f83f784b54a616 | |
| author | Stefan Kögl <stefan@skoegl.net> | |
| Mon, 26 Nov 2012 17:19:45 +0000 (26 18:19 +0100) | ||
| committer | Stefan Kögl <stefan@skoegl.net> | |
| Mon, 26 Nov 2012 17:20:59 +0000 (26 18:20 +0100) | ||
| tree | 8fc232496f45a6498843e5f554a30b651cf2d4ea | treesnapshot (tar.gz zip) |
| parent | 64022d100a29ee965c483ef110cf2f31326fc848 | commitdiff |
| parent | a70d9d48d432dad5e3dd09017b20264a53acfc79 | commitdiff |
Merge branch 'master' into upload-timestamps
Conflicts:
INSTALL.md
Conflicts:
INSTALL.md
| INSTALL.md | diff1 | diff2 | blobhistory |
| mygpo/settings.py | diff1 | diff2 | blobhistory |
| mygpo/users/models.py | diff1 | diff2 | blobhistory |
| mygpo/web/views/episode.py | diff1 | diff2 | blobhistory |