Merge branch 'catalog'

Browse Source

Conflicts:
	local/config/schema.xml

...

This commit is contained in:

Franck Allimant

2013-10-24 16:47:53 +02:00

parent 4065f338b9 4f7e7660ca

commit db6d5692eb

17 changed files with 2040 additions and 1364 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

2513

local/config/schema.xml

File diff suppressed because it is too large Load Diff