Laurent Destailleur 7f18dfee0d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/skeletons/build_class_from_table.php dev/skeletons/skeleton_card.php htdocs/compta/facture/class/facture.class.php htdocs/core/lib/functions.lib.php htdocs/filefunc.inc.php htdocs/projet/card.php		2017-06-03 01:55:05 +02:00
..
contrat.class.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-03 01:55:05 +02:00
index.html	readd index.html file	2015-02-02 11:13:11 +01:00