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

# By Etienne Roudeix (4) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Removed InternalEvent, simplified SecurityContext
  rewriting tables
  rewriting tables
  rewriting tables
  rewriting tables

Conflicts:
	composer.lock
	local/config/schema.xml

2013-08-28 18:19:38 +02:00

55 KiB

Executable File

Raw Blame History

View Raw