| commit | 7acc5b64a2d4450d593f39b00129375f0aebab95 | |
| author | Stefan Kögl <stefan@skoegl.net> | |
| Tue, 5 Jun 2012 14:26:32 +0000 (5 16:26 +0200) | ||
| committer | Stefan Kögl <stefan@skoegl.net> | |
| Tue, 5 Jun 2012 14:26:32 +0000 (5 16:26 +0200) | ||
| tree | 456e5d9fff4af673eff7711b8423a1624c9a3537 | treesnapshot (tar.gz zip) |
| parent | 30b454f30a3bfa8efe5200f92688e97c6a72d80e | commitdiff |
| parent | 3248d063e28e7c8d8f2afb87d97ebbb5b4ed5b1e | commitdiff |
Merge branch 'master' into admin
Conflicts:
mygpo/maintenance/merge.py
Conflicts:
mygpo/maintenance/merge.py
| mygpo/core/models.py | diff1 | diff2 | blobhistory |
| mygpo/maintenance/merge.py | diff1 | diff2 | blobhistory |