franck d11906eca5 Merge branch 'master' of https://github.com/thelia/thelia ...

Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml

2013-09-06 17:48:12 +02:00

..

assets

Working :

2013-09-06 12:12:27 +02:00

includes

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-06 16:18:54 +02:00

404.html

Smarty inheritance in admin template.

2013-09-03 11:26:03 +02:00

admin-layout.tpl

Working :

2013-09-06 17:45:22 +02:00

categories.html

Continuing categories administration...

2013-09-06 17:46:40 +02:00

category-edit.html

Categories refactoring

2013-09-06 15:56:06 +02:00

configuration.html

Working : Major class changes migration from bootstrap 2.x to 3.0

2013-09-04 11:35:22 +02:00

currencies.html

Categories refactoring

2013-09-06 15:56:06 +02:00

currency-edit.html

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-05 23:30:50 +02:00

general_error.html

Event harmonization with MRA

2013-09-04 15:45:46 +02:00

home.html

Working : Major class changes migration from bootstrap 2.x to 3.0

2013-09-04 11:35:22 +02:00

login.html

Working : Finish renaming class for bootstrap migration

2013-09-04 15:05:49 +02:00

message-edit.html

Working :

2013-09-06 12:55:53 +02:00

messages.html

Working :

2013-09-06 12:55:53 +02:00

product-attributes-edit.html

Working :

2013-09-06 17:23:06 +02:00

product-attributes.html

Working :

2013-09-06 16:47:21 +02:00

variable-edit.html

Working :

2013-09-06 12:30:40 +02:00

variables.html

Working :

2013-09-06 11:48:24 +02:00