Laurent Destailleur f2cd96b9c0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: ChangeLog htdocs/adherents/class/adherent.class.php htdocs/core/lib/price.lib.php htdocs/filefunc.inc.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/supplier_proposal/list.php		2017-09-13 20:55:22 +02:00
..
admin	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
class	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-07-15 21:24:21 +02:00
tpl	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
card.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-08-23 16:11:51 +02:00
document.php	Fix delete file not possible for external user even with permissions	2017-08-30 14:34:36 +02:00
index.php	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 13:02:29 +02:00
info.php	Fix missing $form	2017-08-22 10:02:45 +02:00
list.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-09-13 20:55:22 +02:00
note.php	Useless bottom-border	2017-03-21 10:54:47 +01:00