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

..

bootstrap-editable

Factorized ModelCriterialTools calls in loops

2013-08-28 19:47:31 +02:00

css

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

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

fonts/bootstrap

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

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

img

Working : Finish renaming class for bootstrap migration

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

js

Working : Cleanup admin new version bootstrap v3

2013-09-04 15:34:29 +02:00

less

Working : Finish renaming class for bootstrap migration

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