Laurent Destailleur 42234ba506 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/price.lib.php		2020-07-24 00:07:57 +02:00
..
admin	Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword	2020-05-23 18:54:33 +02:00
bookkeeping	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-17 19:27:39 +02:00
class	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-17 19:27:39 +02:00
closure	add new rule	2020-05-21 00:02:33 +02:00
customer	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-16 22:57:50 +02:00
expensereport	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-16 22:57:50 +02:00
journal	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-07-24 00:07:57 +02:00
supplier	Fix regression	2020-07-10 03:59:28 +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