Laurent Destailleur
b3491ef4e5
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
ChangeLog
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/admin/facture_cust_extrafields.php
htdocs/compta/facture/admin/facturedet_cust_extrafields.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
..
2015-10-16 10:12:36 +02:00
2015-09-26 08:44:34 +02:00
2015-09-24 18:27:13 +02:00
2015-10-03 14:28:31 +02:00
2015-09-16 22:04:03 +02:00
2015-09-24 18:34:58 +02:00
2015-10-04 12:31:32 +02:00
2015-01-23 18:41:53 +01:00
2015-09-24 18:27:13 +02:00