Laurent Destailleur c06abac49e Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/compta/salaries/index.php htdocs/contact/class/contact.class.php htdocs/core/class/commonobject.class.php htdocs/core/lib/geturl.lib.php htdocs/core/lib/pdf.lib.php		2015-08-30 21:20:50 +02:00
..
contact.class.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-08-30 21:20:50 +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