Laurent Destailleur b47dbc7a5f Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/install/pgsql/functions/functions.sql htdocs/projet/element.php		2015-11-26 01:32:21 +01:00
..
functions.sql	Merge remote-tracking branch 'origin/3.8' into develop	2015-11-26 01:32:21 +01: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