| commit | 93e5174ebe2f99a3dcf50ae902d35c06b0d3ef10 | |
| author | Stefan Koegl <stefan@skoegl.net> | |
| Sat, 30 Jan 2010 15:18:38 +0000 (30 16:18 +0100) | ||
| committer | Stefan Koegl <stefan@skoegl.net> | |
| Sat, 30 Jan 2010 15:18:38 +0000 (30 16:18 +0100) | ||
| tree | 4ac5fea230fc8d7e41b3515fbbd6588c8a21a731 | treesnapshot (tar.gz zip) |
| parent | efcc0ee849162493ef589bd84ab2b75e185ab2cf | commitdiff |
| parent | bf0917e8d297478648248b9dcb1d67b394df46e3 | commitdiff |
Merge branch 'master' of dgpo:~armin/mygpo-src
Conflicts:
install/update-13.sql
mygpo/web/templates/episode.html
mygpo/web/templates/history.html
mygpo/web/templates/podcast.html
Needed to move changes from update-{12,13}.sql to update-14.sql, because the
update have already been applied to the production database
Conflicts:
install/update-13.sql
mygpo/web/templates/episode.html
mygpo/web/templates/history.html
mygpo/web/templates/podcast.html
Needed to move changes from update-{12,13}.sql to update-14.sql, because the
update have already been applied to the production database