Laurent Destailleur 4d4fc87e2b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/commande/dispatch.php htdocs/product/stock/productlot_list.php htdocs/websites/index.php		2016-08-09 13:26:08 +02:00
..
class	Fix edit of page in module website	2016-08-08 18:25:37 +02:00
frametop.php	Work on website module	2016-02-02 16:24:12 +01:00
index.html	Work on CMS module	2016-01-24 21:35:41 +01:00
index.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-09 13:26:08 +02:00