Laurent Destailleur e6e18ff616 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/menus/edit.php htdocs/product/stock/card.php htdocs/product/stock/info.php htdocs/product/stock/movement_list.php		2019-02-14 15:33:17 +01:00
..
export.class.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-14 15:33:17 +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