| commit | 93c5121b427757a1ca16ed6b0a359d8f4759fb9f | |
| author | Stefan Kögl <stefan@skoegl.net> | |
| Thu, 4 Jun 2015 09:53:07 +0000 (4 11:53 +0200) | ||
| committer | Stefan Kögl <stefan@skoegl.net> | |
| Thu, 4 Jun 2015 09:56:15 +0000 (4 11:56 +0200) | ||
| tree | d2d805fcfdfd1f332408b832a5fc0da87d0d02f7 | treesnapshot (tar.gz zip) |
| parent | 868b6635b1ebc052cad65fceae0b5f50b3fbfd93 | commitdiff |
| parent | e1b83834fcfb73a417d09f19a9bd9a7336e29bbb | commitdiff |
Merge branch 'master' into py3
Conflicts:
mygpo/data/feeddownloader.py
Conflicts:
mygpo/data/feeddownloader.py
| mygpo/data/feeddownloader.py | diff1 | diff2 | blobhistory |
| mygpo/directory/views.py | diff1 | diff2 | blobhistory |
| mygpo/settings.py | diff1 | diff2 | blobhistory |
| requirements.txt | diff1 | diff2 | blobhistory |