Corentin Chary 1fc42e083d Merge remote-tracking branch 'origin/master' ... Conflicts: euscanwww/djeuscan/templates/euscan/accounts/euscan_email.txt Signed-off-by: Corentin Chary <corentin.chary@gmail.com>		2012-09-14 10:31:19 +02:00
..
admin/djcelery/taskstate	euscanwww: Fixing tasks	2012-06-27 10:15:30 +02:00
euscan	Merge remote-tracking branch 'origin/master'	2012-09-14 10:31:19 +02:00
registration	euscanwww: Better login template	2012-08-14 12:15:39 +02:00
_base.html	euscanwww: Fixing all templates to be XHTML compliant	2012-08-15 15:33:44 +02:00