| commit | 1cc680651195218519d4cce40d70ea50fbd5e025 | |
| author | Stefan Kögl <stefan@skoegl.net> | |
| Fri, 14 Sep 2012 17:24:18 +0000 (14 19:24 +0200) | ||
| committer | Stefan Kögl <stefan@skoegl.net> | |
| Fri, 14 Sep 2012 17:27:29 +0000 (14 19:27 +0200) | ||
| tree | 64c4cd40d8724938944e07f16e1ee6fdd1ae77a6 | treesnapshot (tar.gz zip) |
| parent | 19b17feea2250f2ec51c52a0c5bf3e672e068e4c | commitdiff |
| parent | bfea172e0a94c58a42b711d3ae4f9bae0d24b422 | commitdiff |
Merge branch 'master' into feedservice
Conflicts:
mygpo/data/feeddownloader.py
mygpo/directory/search.py
mygpo/users/models.py
Conflicts:
mygpo/data/feeddownloader.py
mygpo/directory/search.py
mygpo/users/models.py
| mygpo/core/proxy.py | diff1 | diff2 | blobhistory |
| mygpo/data/feeddownloader.py | diff1 | diff2 | blobhistory |
| mygpo/directory/search.py | diff1 | diff2 | blobhistory |
| mygpo/users/models.py | diff1 | diff2 | blobhistory |