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

..

index.php

add new rule

2020-05-21 15:05:19 +02:00

perday.php

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop

2020-07-24 00:07:57 +02:00

permonth.php

add new rule

2020-05-21 15:05:19 +02:00

perweek.php

add new rule

2020-05-21 15:05:19 +02:00