Laurent Destailleur 693b2fe3b4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture.php htdocs/core/ajax/ajaxdirpreview.php htdocs/core/class/conf.class.php htdocs/core/class/html.formfile.class.php htdocs/core/lib/functions.lib.php htdocs/core/tpl/objectline_create.tpl.php		2017-06-23 11:20:29 +02:00
..
expedition.class.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-23 11:20:29 +02:00
expeditionbatch.class.php	Merge remote-tracking branch 'origin/3.8' into develop	2015-10-16 10:12:36 +02:00
expeditionstats.class.php	Removed closing php tag	2014-05-03 18:18:44 +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