Laurent Destailleur 480a398f36 Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/holiday/card.php htdocs/resource/list.php		2015-12-03 13:06:20 +01:00
..
actions_resource.class.php	Fix: doxygen	2014-09-27 16:00:11 +02:00
html.formresource.class.php	[Qual] Fixed HTML select form selected attribute	2015-05-07 14:21:14 +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
resource.class.php	Merge remote-tracking branch 'origin/3.8' into develop	2015-12-03 13:06:20 +01:00