| commit | c16a78ee4961d1cf63996ee88c5fb1475c034cae | |
| author | Stefan Kögl <stefan@skoegl.net> | |
| Wed, 7 Nov 2012 15:10:47 +0000 (7 16:10 +0100) | ||
| committer | Stefan Kögl <stefan@skoegl.net> | |
| Wed, 7 Nov 2012 15:10:47 +0000 (7 16:10 +0100) | ||
| tree | 6da5c7cbe74315b91cc8e150c38ba619c848a65b | treesnapshot (tar.gz zip) |
| parent | 85dad44d33dac4454e5729c1a11d52d3007ca2bc | commitdiff |
| parent | de1e49ea162e705843cfd3da8dbf67d96395c469 | commitdiff |
Merge branch 'upload-timestamps' of github.com:gpodder/mygpo into upload-timestamps
Conflicts:
mygpo/users/models.py
Conflicts:
mygpo/users/models.py
| mygpo/users/models.py | diff1 | diff2 | blobhistory |