| commit | 1b43d62de64e85efded322ea75c723a7abdd7ab7 | |
| author | Stefan Kögl <stefan@skoegl.net> | |
| Mon, 24 Sep 2012 19:03:27 +0000 (24 21:03 +0200) | ||
| committer | Stefan Kögl <stefan@skoegl.net> | |
| Mon, 24 Sep 2012 19:04:27 +0000 (24 21:04 +0200) | ||
| tree | d294cb9a5aa682a6757ab3e64b581ebd1e8557d7 | treesnapshot (tar.gz zip) |
| parent | a3ea48c293d6fb0af7f8d2fb2e939a8997620ee6 | commitdiff |
| parent | 046028c1d5b25d55f921c25cfad70a0344974d26 | commitdiff |
Merge branch 'master' into dbmodule
Conflicts:
mygpo/data/feeddownloader.py
mygpo/directory/management/commands/update-categories.py
mygpo/publisher/views.py
mygpo/share/views.py
mygpo/users/models.py
Conflicts:
mygpo/data/feeddownloader.py
mygpo/directory/management/commands/update-categories.py
mygpo/publisher/views.py
mygpo/share/views.py
mygpo/users/models.py
12 files changed: