| commit | d3205d3ea5cca648e33e55d6f1e0b77aa63b1853 | |
| author | Stefan Kögl <stefan@skoegl.net> | |
| Thu, 26 Sep 2013 17:22:26 +0000 (26 19:22 +0200) | ||
| committer | Stefan Kögl <stefan@skoegl.net> | |
| Thu, 26 Sep 2013 17:22:26 +0000 (26 19:22 +0200) | ||
| tree | 31fd2ffc62d9025ad6eb9edeb5adc40b83bb45f2 | treesnapshot (tar.gz zip) |
| parent | a843769d55e03447edd03f46ac60977b63c25786 | commitdiff |
| parent | 1027c9c384e181a731398aeea810dd0dcc76936d | commitdiff |
Merge branch 'master' into design
Conflicts:
mygpo/core/models.py
mygpo/web/templates/base.html
mygpo/web/templates/episode.html
mygpo/web/tests.py
mygpo/web/urls.py
mygpo/web/views/episode.py
Conflicts:
mygpo/core/models.py
mygpo/web/templates/base.html
mygpo/web/templates/episode.html
mygpo/web/tests.py
mygpo/web/urls.py
mygpo/web/views/episode.py