Laurent Destailleur c895c892a5 Merge remote-tracking branch 'origin/3.6' into develop ...

Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php

2014-07-29 01:17:00 +02:00

..

categorie.class.php

Merge remote-tracking branch 'origin/3.6' into develop

2014-07-29 01:17:00 +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