| commit | 8cac0747fde55d0723027c6bfe20261b9cb92080 | |
| author | Stefan Koegl <stefan@skoegl.net> | |
| Sat, 16 Jan 2010 13:26:58 +0000 (16 14:26 +0100) | ||
| committer | Stefan Koegl <stefan@skoegl.net> | |
| Sat, 16 Jan 2010 13:26:58 +0000 (16 14:26 +0100) | ||
| tree | 592d822c1d35f203205c3005e5bf0878cbf1b6b6 | treesnapshot (tar.gz zip) |
| parent | bf46b404a3a92b1479c7cb05ef89120cadbbc4b5 | commitdiff |
| parent | d724616663f244a02d1d4262836e3a5b637f4e15 | commitdiff |
Merge branch 'master' of dgpo:mygpo-src
Conflicts:
install/update-12.sql
mygpo/api/sanitizing.py
Conflicts:
install/update-12.sql
mygpo/api/sanitizing.py
| mygpo/api/sanitizing.py | diff1 | diff2 | blobhistory |