Commit Graph

2 Commits

Author SHA1 Message Date
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
mespeche
dafaa02718 Working : Major class changes migration from bootstrap 2.x to 3.0 2013-09-04 11:35:22 +02:00