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
..
class	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00
emptyexample.php	function declaration	2018-08-15 17:34:35 +02:00
import.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-04 21:35:43 +02:00
index.php	Standardize code	2018-08-13 11:25:48 +02:00