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

4.0 KiB

Raw Blame History

View Raw