Laurent Destailleur 999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/salaries/card.php htdocs/compta/sociales/class/chargesociales.class.php htdocs/takepos/invoice.php		2019-08-26 16:49:25 +02:00
..
admin
class
stats
card.php
document.php
info.php
list.php