Laurent Destailleur 42ca3bcdc7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/salaries/class/paymentsalary.class.php		2020-12-30 13:23:50 +01:00
..
index.html
paymentsalary.class.php	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2020-12-30 13:23:50 +01:00
salariesstats.class.php	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00