Merge remote-tracking branch 'origin/3.3' into develop

Browse Source

Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php

...

This commit is contained in:

Laurent Destailleur

2013-01-13 19:33:54 +01:00

parent 8ff12f7d55 0f6506d457

commit 29e6d01e51

49 changed files with 4026 additions and 3637 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

BIN

htdocs/install/mssql/functions/functions.sql

Binary file not shown.