Laurent Destailleur da672c8776 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/card.php htdocs/admin/translation.php htdocs/core/class/html.formfile.class.php htdocs/societe/card.php		2020-06-06 11:57:31 +02:00
..
admin	Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword	2020-05-23 18:54:33 +02:00
bookkeeping	add new rule	2020-05-21 15:05:19 +02:00
class	add new rule	2020-05-21 15:05:19 +02:00
closure	add new rule	2020-05-21 00:02:33 +02:00
customer	Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword	2020-05-23 21:45:18 +02:00
expensereport	Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword	2020-05-23 21:45:18 +02:00
journal	add new rule	2020-05-21 15:05:19 +02:00
supplier	Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword	2020-05-23 21:45:18 +02:00
tpl	add new rule	2020-05-21 15:05:19 +02:00
index.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-06 11:57:31 +02:00