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

Conflicts:
	htdocs/core/lib/functions2.lib.php

2020-10-22 17:34:48 +02:00

..

card.php

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

2020-10-22 17:34:48 +02:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00