Etienne Roudeix a647bfd016 Merge branch 'master' into tax ...

Conflicts:
	local/config/schema.xml

2013-09-27 13:35:39 +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

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

2013-09-27 10:37:09 +02:00

less

Merge branch 'master' into tax

2013-09-27 10:29:51 +02:00