Laurent Destailleur 7bfbf3c88b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ...

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

2020-05-23 20:20:53 +02:00

..

holiday.class.php

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

2020-05-23 20:20:53 +02:00

index.html

…