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

# By Manuel Raynaud (2) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Completed mailing templates management
  change symfony/icu version for compatibility
  add file reset_install.sh

Conflicts:
	composer.json
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Model/Map/CouponI18nTableMap.php
	install/thelia.sql
	local/config/schema.xml
	reset_install.sh

2013-09-02 17:25:25 +02:00

1.8 KiB

Executable File

Raw Blame History

View Raw