dolibarr/htdocs/imports
Laurent Destailleur 97fce71218 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
	htdocs/product/fiche.php
	htdocs/projet/tasks/task.php
2014-04-26 22:35:35 +02:00
..
class Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
emptyexample.php Prepare move to other licence. For the moment all answers for licence 2013-01-16 15:36:08 +01:00
import.php Merge remote-tracking branch 'origin/3.5' into develop 2014-04-26 22:35:35 +02:00
index.php Fix: EOF 2013-06-05 16:24:32 +02:00