dolibarr/htdocs/contrat
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
..
admin FIX change my deprecated email 2018-10-27 14:43:12 +02:00
class Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2018-10-30 18:29:28 +01:00
tpl FIX change my deprecated email 2018-10-27 14:43:12 +02:00
card.php FIX change my deprecated email 2018-10-27 14:43:12 +02:00
contact.php FIX change my deprecated email 2018-10-27 14:43:12 +02:00
document.php FIX change my deprecated email 2018-10-27 14:43:12 +02:00
index.php FIX change my deprecated email 2018-10-27 14:43:12 +02:00
info.php test include 2018-07-26 17:30:53 +02:00
list.php FIX change my deprecated email 2018-10-27 14:43:12 +02:00
note.php FIX change my deprecated email 2018-10-27 14:43:12 +02:00
services_list.php FIX change my deprecated email 2018-10-27 14:43:12 +02:00