| commit | fae74ffe86ed964fad49b468d8d33994f56dd3ab | |
| author | Stefan Kögl <stefan@skoegl.net> | |
| Fri, 27 Jan 2012 19:54:13 +0000 (27 19:54 +0000) | ||
| committer | Stefan Kögl <stefan@skoegl.net> | |
| Fri, 27 Jan 2012 19:54:37 +0000 (27 19:54 +0000) | ||
| tree | a4328833785a982a7c310645d8ad40abee0c191b | treesnapshot (tar.gz zip) |
| parent | d9459b260a146d2e6d63cba2267df73ce1ee65e9 | commitdiff |
avoid further update conflicts
| mygpo/web/views/__init__.py | diffblobblamehistory | |
| mygpo/web/views/users.py | diffblobblamehistory |