Laurent Destailleur fb811a1656 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/system/database-tables.php htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/core/class/commonobject.class.php htdocs/langs/fr_FR/withdrawals.lang htdocs/societe/class/societe.class.php		2020-08-03 14:44:01 +02:00
..
about.php
browser.php
constall.php
database-tables.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-08-03 14:44:01 +02:00
database.php
dbtable.php
dolibarr.php
filecheck.php
index.php
modules.php
os.php
perf.php
phpinfo.php
web.php
xcache.php
xdebug.php