Laurent Destailleur 1fe9783760 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ...

Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/product/index.php

2020-02-05 14:38:19 +01:00

..

holiday.class.php

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

2020-02-05 14:38:19 +01:00

index.html

…