Laurent Destailleur ae103e34b8 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: build/debian/changelog htdocs/compta/facture.php htdocs/core/lib/price.lib.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/opensurvey/public/studs.php htdocs/projet/element.php		2015-04-13 13:08:46 +02:00
..
export.class.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-04-13 13:08:46 +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