| commit | 6a09890971df63eff18ded70b08e947c7eced7eb | |
| author | Stefan Koegl <stefan@skoegl.net> | |
| Thu, 7 Jan 2010 18:28:39 +0000 (7 19:28 +0100) | ||
| committer | Stefan Koegl <stefan@skoegl.net> | |
| Thu, 7 Jan 2010 18:28:39 +0000 (7 19:28 +0100) | ||
| tree | 6d1a6c33c0bf6ea08a2533334af609a76b1737ee | treesnapshot (tar.gz zip) |
| parent | 68fc5191b033c10bb0a5c547781b763b85deff96 | commitdiff |
| parent | be365c74b30b6f3e3786d222933f0cfc05d7b75d | commitdiff |
Merge branch 'master' of dgpo:~martin/mygpo-src
Conflicts:
mygpo/web/templates/login.html
Conflicts:
mygpo/web/templates/login.html