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

Conflicts:
	htdocs/projet/element.php

2020-06-24 09:59:08 +02:00

..

about.php

…

browser.php

…

constall.php

…

database-tables.php

…

database.php

…

dbtable.php

…

dolibarr.php

…

filecheck.php

…

index.php

…

modules.php

…

os.php

…

perf.php

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

2020-06-24 09:59:08 +02:00

phpinfo.php

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

2020-05-31 00:31:14 +02:00

web.php

…

xcache.php

…

xdebug.php

…