Commit Graph

2 Commits

Author SHA1 Message Date
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-01-13 19:33:54 +01:00
Laurent Destailleur
8089dd48fd Move mysql/pgsql/mssql dir into install directory. 2009-10-07 18:17:55 +00:00