Laurent Destailleur 0debcf745a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/cron/card.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php

2016-09-09 09:32:14 +02:00

..

doctemplates

…

lib

…

mssql

…

mysql

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

2016-09-09 09:32:14 +02:00

pgsql

…

sqlite3

…

.gitignore

…

check.php

…

default.css

…

fileconf.php

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

2016-09-09 09:32:14 +02:00

inc.php

…

index.php

…

install.forced.sample.php

…

phpinfo.php

…

repair.php

…

robots.txt

…

step1.php

…

step2.php

…

step4.php

…

step5.php

…

upgrade2.php

…

upgrade.php

…