| commit | 5cc63e80c6e418aad0ef8be98f3a30f136722acc | |
| author | Stefan Kögl <stefan@skoegl.net> | |
| Thu, 11 Oct 2012 17:28:56 +0000 (11 19:28 +0200) | ||
| committer | Stefan Kögl <stefan@skoegl.net> | |
| Thu, 11 Oct 2012 17:28:56 +0000 (11 19:28 +0200) | ||
| tree | 9fa1d9f868c30999437e0b53459289b81beccd16 | treesnapshot (tar.gz zip) |
| parent | f52be88a57fb6bcacd9b5847113a5928a7d78265 | commitdiff |
| parent | 71c3c5d3de2041f136bd9399cf019d108b5d4a71 | commitdiff |
Merge branch 'dbmodule'
Conflicts:
mygpo/web/views/__init__.py
Conflicts:
mygpo/web/views/__init__.py
| mygpo/web/views/__init__.py | diff1 | diff2 | blobhistory |
| mygpo/web/views/podcast.py | diff1 | diff2 | blobhistory |