| commit | 44c4c58bc33e30f54a3bd0517fcc1bb6b8459b0e | |
| author | Stefan Koegl <stefan@skoegl.net> | |
| Tue, 1 Dec 2009 15:29:02 +0000 (1 16:29 +0100) | ||
| committer | Stefan Koegl <stefan@skoegl.net> | |
| Tue, 1 Dec 2009 15:29:02 +0000 (1 16:29 +0100) | ||
| tree | cd97dc3386bb2be73cf6595b5ced016be7e42e86 | treesnapshot (tar.gz zip) |
| parent | e9e1b646b74e79e7f8a54856141618f1d8df4c27 | commitdiff |
| parent | 16529b837e2f663a6d006e921f0059025174dff6 | commitdiff |
Merge branch 'master' of dgpo:~martin/mygpo-src
Conflicts:
install/update-04.sql
Conflicts:
install/update-04.sql
| install/update-04.sql | diff1 | diff2 | blobhistory |
| mygpo/urls.py | diff1 | diff2 | blobhistory |