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

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	templates/admin/default/assets/css/admin.less
	templates/admin/default/currencies.html
	templates/admin/default/general_error.html
	templates/admin/default/messages.html
	templates/admin/default/variables.html

2013-09-04 17:40:34 +02:00

..

assets

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

2013-09-04 17:40:34 +02:00

includes

Working : Finish renaming class for bootstrap migration

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

404.html

Smarty inheritance in admin template.

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

admin-layout.tpl

Working : Finish renaming class for bootstrap migration

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

categories.html

Working : Finish renaming class for bootstrap migration

2013-09-04 15:05:49 +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

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

2013-09-04 17:40:34 +02:00

currency-edit.html

Working : Finish renaming class for bootstrap migration

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

edit_category.html

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

2013-09-04 11:35:22 +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 : Finish renaming class for bootstrap migration

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

messages.html

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

2013-09-04 17:40:34 +02:00

variable-edit.html

Working : Finish renaming class for bootstrap migration

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

variables.html

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

2013-09-04 17:40:34 +02:00