Merge branch 'master' into modules

Browse Source

Conflicts:
	templates/backOffice/default/product-edit.html

...

This commit is contained in:

Manuel Raynaud

2013-12-17 10:48:59 +01:00

parent 65f43b5eff e5576864cd

commit 0c24a8afc0

121 changed files with 4530 additions and 2203 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

2551

local/config/schema.xml

File diff suppressed because it is too large Load Diff