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-24 18:34:58 +02:00
2015-10-16 10:12:36 +02:00
2015-10-04 20:57:00 +02:00
2015-10-16 10:12:36 +02:00
2015-10-15 03:29:35 +02:00
2015-09-24 18:34:58 +02:00
2015-10-13 13:06:32 +02:00
2015-06-26 06:49:43 +02:00
2015-10-13 14:21:00 +02:00
2015-10-09 12:30:16 +02:00
2014-05-03 18:18:44 +02:00
2015-10-16 10:12:36 +02:00
2014-10-04 17:20:17 +02:00
2015-10-13 13:06:32 +02:00
2015-10-13 13:06:32 +02:00