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_expensereports.class.php	Fix merge	2017-02-27 01:23:21 +01:00
expensereport.class.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-05 22:11:35 +01:00
expensereportstats.class.php	Fix statistics of leave requests (date valid not defined if status is	2017-01-22 16:03:08 +01:00
index.html	Add index.html	2015-03-07 15:14:51 +01:00
paymentexpensereport.class.php	Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9	2017-02-02 01:20:45 +01:00