Laurent Destailleur 5f79b2d0c6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/account.php htdocs/accountancy/admin/categories.php htdocs/expensereport/class/expensereport.class.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql		2017-03-05 22:11:35 +01:00
..
api_proposals.class.php	Fix return code REST similar for all api with POST	2016-12-23 02:08:22 +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
propal.class.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-05 22:11:35 +01:00
propalestats.class.php	NEW Add statistics for interventions module	2016-01-25 13:34:05 +01:00