dolibarr/htdocs/categories/class
Laurent Destailleur 3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
2016-03-02 23:40: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-03-02 23:40: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