dolibarr/htdocs/societe/admin
Laurent Destailleur f3ef6448d7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/admin/supplier_payment.php
	htdocs/core/lib/ajax.lib.php
	htdocs/don/admin/donation.php
	htdocs/product/admin/product.php
2017-08-23 16:11:51 +02:00
..
contact_extrafields.php NEW Add last activation author and ip of modules 2017-05-06 20:43:14 +02:00
societe_extrafields.php NEW Add last activation author and ip of modules 2017-05-06 20:43:14 +02:00
societe.php Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-08-23 16:11:51 +02:00