| commit | 5726dd3a75ffba674c938365030e565f903a47ea | |
| author | Stefan Kögl <stefan@skoegl.net> | |
| Wed, 2 Oct 2013 16:40:37 +0000 (2 18:40 +0200) | ||
| committer | Stefan Kögl <stefan@skoegl.net> | |
| Wed, 2 Oct 2013 16:40:37 +0000 (2 18:40 +0200) | ||
| tree | 2e4d398d10609993f6bddcc00c8e2d7a71d612a6 | treesnapshot (tar.gz zip) |
| parent | 5f28294202a0a0cf743094c9bd969af478c51b71 | commitdiff |
| parent | 22441e0b420c313c60fb56afb46a56a7084a61db | commitdiff |
Merge branch 'master' into design
Conflicts:
mygpo/web/templates/podcast.html
mygpo/web/utils.py
Conflicts:
mygpo/web/templates/podcast.html
mygpo/web/utils.py
| mygpo/db/couchdb/podcast.py | diff1 | diff2 | blobhistory |
| mygpo/web/utils.py | diff1 | diff2 | blobhistory |
| mygpo/web/views/episode.py | diff1 | diff2 | blobhistory |
| mygpo/web/views/podcast.py | diff1 | diff2 | blobhistory |