Laurent Destailleur 57cfb4b007 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/actions_massactions.inc.php htdocs/website/class/website.class.php		2019-06-02 12:36:07 +02:00
..
dolresource.class.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-06-02 12:36:07 +02:00
html.formresource.class.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-06-02 12:36:07 +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