dolibarr/htdocs/projet/activity
Laurent Destailleur 91aabbb40e Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/main.inc.php
2014-08-08 01:19:03 +02:00
..
index.php Qual: remove PHP closing tag (again) 2014-05-26 13:51:25 +02:00
list.php Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-08 01:19:03 +02:00