Andreas Burchert (scarya) 7b01cb47de Merge branch 'redesign' of git.froxlor.org:froxlor into redesign ...

Conflicts:
	templates/Froxlor/customer/email/emails_add.tpl
	templates/Froxlor/customer/email/emails_edit.tpl
	templates/Froxlor/customer/email/forwarder_add.tpl

2011-02-12 18:25:19 +01:00

..

Classic

Fixed email templates in design: Classic, Froxlor

2011-02-12 18:20:22 +01:00

Froxlor

Merge branch 'redesign' of git.froxlor.org:froxlor into redesign

2011-02-12 18:25:19 +01:00

misc

Merge branch 'master' into redesign

2011-02-11 13:39:07 +01:00