Files
dolibarr/htdocs/core/lib
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-08-30 05:30:37 +02:00
2014-07-28 20:33:37 +02:00
2014-11-05 16:26:11 +01:00
2014-12-22 03:01:31 +01:00
2014-09-23 16:15:15 +02:00
2014-09-04 15:48:49 +02:00
2014-12-20 15:42:03 +01:00
2014-11-05 17:32:42 +01:00
2014-06-12 11:31:53 +02:00
2014-11-15 18:30:37 +01:00
2014-09-27 16:00:11 +02:00
2014-09-27 16:00:11 +02:00