| commit | 0f419392b4890e7e4f6ae028884d2bc576511b0c | |
| author | Stefan Kögl <stefan@skoegl.net> | |
| Fri, 21 Sep 2012 16:00:39 +0000 (21 18:00 +0200) | ||
| committer | Stefan Kögl <stefan@skoegl.net> | |
| Fri, 21 Sep 2012 16:00:39 +0000 (21 18:00 +0200) | ||
| tree | dd17f06e7daa08f5f4104980939dd716d4f8feac | treesnapshot (tar.gz zip) |
| parent | 8cae3fd71642e44e0de34572c905b19bd63c8c5c | commitdiff |
| parent | ddf31debb1cc87e0511bb8de58daf735fd6a9bae | commitdiff |
Merge branch 'dbmodule' of github.com:gpodder/mygpo into dbmodule
Conflicts:
mygpo/api/advanced/settings.py
mygpo/db/couchdb/episode_state.py
mygpo/maintenance/management/commands/dump-sample.py
mygpo/users/models.py
mygpo/web/views/episode.py
Conflicts:
mygpo/api/advanced/settings.py
mygpo/db/couchdb/episode_state.py
mygpo/maintenance/management/commands/dump-sample.py
mygpo/users/models.py
mygpo/web/views/episode.py
| mygpo/db/couchdb/episode_state.py | diff1 | diff2 | blobhistory |