Laurent Destailleur be6f99c10e Merge remote-tracking branch 'origin/3.6' into develop ...

Conflicts:
	htdocs/admin/dict.php
	htdocs/core/db/mysql.class.php
	htdocs/core/db/mysqli.class.php
	htdocs/core/lib/ajax.lib.php

2014-08-17 19:34:12 +02:00

..

Database.interface.php

Corrected Database.interface doc

2014-05-03 13:27:24 +02:00

DoliDB.class.php

Qual: Remove usage of getStaticMember function dir constants.

2014-07-31 20:12:21 +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

mssql.class.php

Avoid duplicate logs

2014-08-15 19:29:19 +02:00

mysql.class.php

Merge remote-tracking branch 'origin/3.6' into develop

2014-08-17 19:34:12 +02:00

mysqli.class.php

Merge remote-tracking branch 'origin/3.6' into develop

2014-08-17 19:34:12 +02:00

pgsql.class.php

Merge remote-tracking branch 'origin/3.6' into develop

2014-08-17 19:34:12 +02:00

sqlite.class.php

Removed 2 other call to getStaticMember (pb with php 5.5).Fix PHPCS for

2014-08-01 00:53:29 +02:00