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-10-09 20:00:43 +02:00
2015-09-24 18:27:13 +02:00
2015-06-01 11:00:11 +02:00
2015-10-16 10:12:36 +02:00
2015-02-18 21:01:17 +01:00
2015-04-19 03:05:37 +02:00
2014-09-18 20:33:37 +02:00
2015-10-03 23:06:05 +02:00
2014-09-13 19:10:05 +02:00
2015-10-13 12:05:24 +02:00
2014-09-18 20:33:37 +02:00
2015-09-24 18:34:58 +02:00