Merge branch 'master' into tax

Browse Source

Conflicts:
	templates/default_save/product.html

...

This commit is contained in:

Etienne Roudeix

2013-09-10 19:15:15 +02:00

parent f70cecbbe9 04d517208f

commit 3b433a0c8d

46 changed files with 1550 additions and 751 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

544

install/insert.sql

File diff suppressed because it is too large Load Diff