Manuel Raynaud 672b489418 Merge branch 'master' into template ...

Conflicts:
	templates/admin/default/customers.html
	templates/default/register.html

2013-09-10 17:09:22 +02:00

..

assets

complete login form

2013-09-10 12:16:19 +02:00

index.html

replace <i> tag by <span> for displaying icons

2013-09-10 17:07:20 +02:00

layout.tpl

replace <i> tag by <span> for displaying icons

2013-09-10 17:07:20 +02:00

login.html

replace <i> tag by <span> for displaying icons

2013-09-10 17:07:20 +02:00

register.html

Merge branch 'master' into template

2013-09-10 17:09:22 +02:00