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

Browse Source

# 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

...

This commit is contained in:

gmorel

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

parent 6c2dbb0152 0361cd1ff2

commit 71a91ff60f

53 changed files with 6375 additions and 5245 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2252

local/config/schema.xml

File diff suppressed because it is too large Load Diff