Laurent Destailleur 252d8da8fc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/categories/class/categorie.class.php htdocs/core/class/commondocgenerator.class.php htdocs/core/lib/functions.lib.php htdocs/core/modules/DolibarrModules.class.php htdocs/filefunc.inc.php htdocs/societe/class/societe.class.php htdocs/supplier_proposal/class/supplier_proposal.class.php		2017-07-07 15:11:53 +02:00
..
doc_generic_order_odt.modules.php	NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead	2016-04-17 15:24:22 +02:00
index.html
pdf_einstein.modules.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-07-07 15:11:53 +02:00
pdf_proforma.modules.php	Fix doxygen	2016-05-18 14:43:56 +02:00