Files
dolibarr/htdocs/projet/class
Laurent Destailleur f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php
2014-09-13 19:10:05 +02:00
..