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-08-13 05:15:42 +02:00
2014-07-12 23:18:57 +02:00
2015-02-14 16:27:00 +01:00
2015-10-15 12:18:17 +02:00
2015-09-07 21:42:12 +02:00
2015-03-05 10:52:37 +01:00
2015-10-11 19:47:47 +02:00
2015-09-07 13:24:52 +02:00
2014-12-03 17:06:44 +01:00
2015-07-12 11:44:37 +02:00
2015-10-16 10:12:36 +02:00
2015-10-16 10:12:36 +02:00
2015-07-06 16:34:31 +02:00
2014-05-03 18:18:44 +02:00
2015-07-20 13:55:43 +02:00
2015-07-06 16:39:49 +02:00
2015-07-06 16:34:31 +02:00
2015-07-06 16:34:31 +02:00
2015-07-06 16:34:31 +02:00
2015-10-01 11:16:35 +02:00
2015-07-20 13:55:43 +02:00