Laurent Destailleur 38d4284638 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/core/db/pgsql.class.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/filefunc.inc.php
	htdocs/imports/import.php
	htdocs/supplier_proposal/card.php

2019-02-08 11:26:08 +01:00

..

Database.interface.php

Squiz.Functions.FunctionDeclarationArgumentSpacing

2019-01-27 15:20:16 +01:00

DoliDB.class.php

Merge branch 'develop' into nospaceaftercomma

2019-01-30 18:27:35 +01: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

mssql.class.php

Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma

2019-01-27 23:23:38 +01:00

mysqli.class.php

Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma

2019-01-27 23:23:38 +01:00

pgsql.class.php

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

2019-02-08 11:26:08 +01:00

sqlite3.class.php

Merge remote-tracking branch 'upstream/develop' into psr2squizwhite

2019-02-03 22:41:57 +01:00