Laurent Destailleur 3b70bbb05a Merge remote-tracking branch 'origin/3.8' into 3.9 ...

Conflicts:
	htdocs/core/lib/admin.lib.php

2016-03-02 23:07:42 +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 3.9

2016-03-02 23:07:42 +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