Laurent Destailleur ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture/card.php htdocs/filefunc.inc.php		2018-09-04 21:35:43 +02:00
..
canvas	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00
class	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
agenda.php	loadlangs	2018-05-26 20:32:23 +02:00
card.php	loadlangs	2018-05-26 20:32:23 +02:00
document.php	comment translation	2018-08-04 14:17:51 +02: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	loadlangs	2018-05-26 20:32:23 +02:00
ldap.php	loadlangs	2018-05-26 20:32:23 +02:00
list.php	Fix fax not required as visible by default on list	2018-09-04 09:48:30 +02:00
note.php	loadlangs	2018-05-26 20:32:23 +02:00
perso.php	loadlangs	2018-05-26 20:32:23 +02:00
vcard.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-08-13 04:03:23 +02:00