Laurent Destailleur 9c8d69eaa9 Merge remote-tracking branch 'origin/3.9' into develop ...

Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php

2016-02-19 04:46:11 +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.9' into develop

2016-02-19 04:46:11 +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