Laurent Destailleur f747cefda3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/install/upgrade2.php		2018-07-16 15:44:44 +02:00
..
Database.interface.php
DoliDB.class.php
index.html
mssql.class.php
mysqli.class.php
pgsql.class.php
sqlite3.class.php