| commit | bf229d2c8d981cfc8ef0322ee2d799ab75218e1e | |
| author | Stefan Kögl <stefan@skoegl.net> | |
| Thu, 4 Jun 2015 13:39:42 +0000 (4 15:39 +0200) | ||
| committer | Stefan Kögl <stefan@skoegl.net> | |
| Thu, 4 Jun 2015 13:39:42 +0000 (4 15:39 +0200) | ||
| tree | c8e1b5168d879ab67646bef904bd6ee738d4c336 | treesnapshot (tar.gz zip) |
| parent | 8c8c91931a7dcc80182c205cbeb5abcdece66ea3 | commitdiff |
| parent | f956fd6e6898fdae61e4264947b2235d9e90658d | commitdiff |
Merge branch 'master' into py3
Conflicts:
requirements.txt
Conflicts:
requirements.txt
| mygpo/data/feeddownloader.py | diff1 | diff2 | blobhistory |
| mygpo/settings.py | diff1 | diff2 | blobhistory |
| requirements.txt | diff1 | diff2 | blobhistory |