Laurent Destailleur c4ca4a5a16 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/tva/index.php htdocs/install/mysql/data/llx_accounting_category.sql		2018-03-15 15:11:18 +01:00
..
clientfourn.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-15 15:11:18 +01:00
index.php	Fix: regression, restore primary key	2018-03-08 07:41:54 +01:00
result.php	Add code to help debug	2018-03-15 13:21:02 +01:00