Laurent Destailleur 5bd538fb2c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/core/modules/modStripe.class.php htdocs/filefunc.inc.php htdocs/projet/element.php		2018-09-20 23:43:34 +02:00
..
doc_generic_order_odt.modules.php	Standardize and update code	2018-09-18 11:02:18 +02:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
pdf_einstein.modules.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-20 23:43:34 +02:00
pdf_proforma.modules.php	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00