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

Conflicts:
	templates/admin/default/currencies.html

2013-09-05 23:30:50 +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 : Add of bootstrap-editable in good directories

2013-09-05 11:14:31 +02:00

js

Working : Add of bootstrap-editable in good directories

2013-09-05 11:14:31 +02:00

less

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

2013-09-05 23:30:50 +02:00