Laurent Destailleur 192fb45ce7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/accountancy/bookkeeping/card.php htdocs/accountancy/bookkeeping/list.php htdocs/adherents/card.php htdocs/compta/sociales/list.php htdocs/compta/sociales/payments.php htdocs/core/modules/import/import_csv.modules.php htdocs/core/modules/import/import_xlsx.modules.php htdocs/holiday/class/holiday.class.php htdocs/viewimage.php		2019-07-30 20:55:15 +02:00
..
doctemplates	Removed bad commited files	2019-06-07 16:56:08 +02:00
lib	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
medias	Remove image	2019-01-31 12:48:51 +01:00
mssql
mysql	Merge branch '10.0' into 10.0	2019-07-25 18:31:26 +02:00
pgsql	Update for pgsql	2019-05-18 01:26:44 +02:00
sqlite3
.gitignore
check.php	Fix for doliwamp	2019-07-01 00:22:28 +02:00
default.css
fileconf.php	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
inc.php	Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma	2019-01-27 23:23:38 +01:00
index.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
install.forced.sample.php
phpinfo.php	PSR2.Files.EndFileNewline.TooMany	2019-01-27 14:10:35 +01:00
repair.php	Fix clean of database	2019-06-22 14:33:31 +02:00
robots.txt
step1.php	Better error message when missing grant privileges	2019-06-05 10:42:59 +02:00
step2.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-07-30 20:55:15 +02:00
step4.php	PSR2 space after comma in function call	2019-01-27 11:55:16 +01:00
step5.php	Merge branch 'develop' into nospaceaftercomma	2019-01-30 18:27:35 +01:00
upgrade.php	update with html5 compliant code	2019-03-15 09:45:01 +01:00
upgrade2.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-06-04 19:03:27 +02:00