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-datepicker/js

Working : bootstrap datepicker commented out to keep style for jquery.datepicker (Mika)

2013-09-13 15:36:15 +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

Merge branch 'template'

2013-09-11 17:26:34 +02:00

js

- Adding of bootstrap-select

2013-09-19 12:31:46 +02:00

less

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

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