Laurent Destailleur ebf68ecbe0 Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: .travis.yml htdocs/contrat/class/contrat.class.php htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php htdocs/core/modules/project/pdf/pdf_baleine.modules.php		2015-12-18 21:03:57 +01:00
..
admin	Fix : [ bug #1549 ] Itïs not possible add ExtraFields	2014-08-06 17:38:44 +02:00
class	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-12-18 21:03:57 +01:00
tpl	Qual: Renamed all files & links "fiche.php" into "card.php"	2014-09-18 21:18:25 +02:00
card.php	FIX Ref/label of product on contract line was not visible, nor into	2015-04-29 19:57:01 +02:00
contact.php	Qual: Renamed all files & links "liste.php" into "list.php"	2014-09-18 20:33:37 +02:00
document.php	Qual: Renamed all files & links "liste.php" into "list.php"	2014-09-18 20:33:37 +02:00
index.php	Fix css missing	2015-05-10 23:43:18 +02:00
info.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-09-13 19:10:05 +02:00
list.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-05-25 18:08:23 +02:00
note.php	Qual: Renamed all files & links "liste.php" into "list.php"	2014-09-18 20:33:37 +02:00
services.php	Update /contrat/services.php	2014-11-23 17:43:44 +01:00