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

# By mespeche
# Via mespeche
* 'master' of https://github.com/thelia/thelia:
  WIP : Comment of route url-rewriting.check
  Working : Fix script reset
  Working : Cleanup admin new version bootstrap v3
  Working : Finish renaming class for bootstrap migration
  Working : Major class changes migration from bootstrap 2.x to 3.0

Conflicts:
	reset_install.sh
	templates/admin/default/assets/css/admin.less

2013-09-04 16:11:51 +02:00

..

lib/Thelia

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

2013-09-04 16:11:51 +02:00

bootstrap.php

Product loop adjustements

2013-08-01 10:53:35 +02:00