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 19:09:37 +02:00
frametop.php
index.html
index.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-09 13:26:08 +02:00