Laurent Destailleur 57cfb4b007 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/actions_massactions.inc.php htdocs/website/class/website.class.php		2019-06-02 12:36:07 +02:00
..
doctemplates	Debug website module	2018-12-17 17:29:04 +01:00
lib	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
medias	Remove image	2019-01-31 12:48:51 +01:00
mssql
mysql	FIX missing llx_const encrypt	2019-05-30 11:42:28 +02:00
pgsql	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-04-13 00:43:37 +02:00
sqlite3
.gitignore
check.php	Try pgsql fix	2019-01-21 01:51:28 +01:00
default.css	trim trailing	2018-07-26 18:05:20 +02:00
fileconf.php	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
inc.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-16 16:48:21 +01:00
index.php	minor html and css corrections (as shown by browser validation and phpstorm inspections)	2018-07-07 23:50:41 +02:00
install.forced.sample.php
phpinfo.php
repair.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-06-02 12:36:07 +02:00
robots.txt
step1.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-01 19:23:06 +01:00
step2.php	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
step4.php	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
step5.php	FIX wrong value for instal lock	2018-12-03 13:31:28 +01:00
upgrade.php	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
upgrade2.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-06-02 12:36:07 +02:00