Laurent Destailleur fead7967f2 Merge remote-tracking branch 'origin/3.9' into 4.0 ... Conflicts: htdocs/commande/list.php htdocs/core/class/commonobject.class.php htdocs/core/class/extrafields.class.php htdocs/resource/class/resource.class.php		2016-08-17 16:55:39 +02:00
..
dolresource.class.php	Merge remote-tracking branch 'origin/3.9' into 4.0	2016-08-17 16:55:39 +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