florian HENRY 137f1c4e4f Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/resource/class/dolresource.class.php		2016-08-18 08:49:54 +02:00
..
dolresource.class.php	Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0	2016-08-18 08:49:54 +02:00
html.formresource.class.php	Debug module resource. Filter on agenda.	2016-06-06 13:05:36 +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