Merge git://hammerboy.no-ip.org/eventmanager
authorwww-data <www-data@mail.holoscopio.com>
Wed, 26 Sep 2007 05:15:32 +0000 (02:15 -0300)
committerwww-data <www-data@mail.holoscopio.com>
Wed, 26 Sep 2007 05:15:32 +0000 (02:15 -0300)
Conflicts:

forms.py
settings.py
templates/editar_trabalho.html
templates/inscricao.html
templates/meus_trabalhos.html
views.py


No differences found