Laurent Destailleur 8d46d76f96 Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/fourn/facture/paiement.php		2016-04-12 15:05:18 +02:00
..
tpl	NEW Merge all boxes "related objects" into one. This save a lot of room	2016-03-30 19:18:31 +02:00
card.php	Merge remote-tracking branch 'origin/3.9' into develop	2016-04-12 15:05:18 +02:00
contact.php	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
document.php	FIX The include file for action on files should not be a template file	2016-04-02 14:16:16 +02:00
impayees.php	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
info.php	Status and amount of object should always be visible.	2015-04-06 16:13:23 +02:00
list.php	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
note.php	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
paiement.php	Merge remote-tracking branch 'origin/3.9' into develop	2016-04-12 15:05:18 +02:00