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-09-24 18:27:13 +02:00
2015-10-16 10:12:36 +02:00
2014-09-18 20:33:37 +02:00
2015-09-24 18:27:13 +02:00
2014-09-18 20:33:37 +02:00
2014-09-18 21:18:25 +02:00
2015-09-24 18:34:58 +02:00
2015-10-04 10:45:57 +02:00
2014-09-18 20:33:37 +02:00
2015-09-24 18:34:58 +02:00