Laurent Destailleur 0314b3b5b1 Merge remote-tracking branch 'origin/3.8' into develop ...

Conflicts:
	ChangeLog

2016-01-02 12:27:08 +01:00

..

api_category.class.php

Fix PHPCS

2015-05-06 00:55:42 +02:00

categorie.class.php

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

2016-01-02 12:27:08 +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