Files
dolibarr/scripts
Laurent Destailleur 657fc1b91c Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	ChangeLog
	htdocs/comm/fiche.php
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/fiche.php
	htdocs/langs/fr_FR/compta.lang
	htdocs/projet/element.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/time.php
2014-12-26 04:44:15 +01:00
..
2014-10-17 15:30:38 +02:00
2013-03-31 04:12:20 +02:00
2014-12-19 12:32:43 +01:00