Laurent Destailleur 43ed48896a Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: build/debian/changelog htdocs/filefunc.inc.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql		2015-06-05 18:31:53 +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
linkedobjectblock.tpl.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-06-05 18:31:53 +02:00