Regis Houssin 9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_email Conflicts: htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php		2018-10-30 18:29:28 +01:00
..
card.php	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-09 13:35:58 +02:00
index.html
info.php	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
list.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-30 14:47:39 +01:00