mespeche 2a6c50c865 Merge branch 'views-management' of https://github.com/thelia/thelia into views-management ...

Conflicts:
	templates/admin/default/tax-rule-edit.html

2013-09-30 10:14:11 +02:00

..

bootstrap

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

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

thelia

Merge branch 'views-management' of https://github.com/thelia/thelia into views-management

2013-09-30 10:14:11 +02:00

main.less

Added a 'development mode' to assetic smarty plugin

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