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

Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
	htdocs/langs/en_US/admin.lang

2018-12-15 18:21:37 +01:00

..

doctemplates

fix #9999

2018-12-01 16:23:40 +01:00

lib

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

medias

…

mssql

…

mysql

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

2018-12-15 18:21:37 +01:00

pgsql

…

sqlite3

…

.gitignore

…

check.php

Migrate to 10

2018-12-14 11:13:48 +01:00

default.css

…

fileconf.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

inc.php

…

index.php

…

install.forced.sample.php

…

phpinfo.php

…

repair.php

FIX change my deprecated email

2018-10-27 14:43:12 +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

upgrade2.php

Merge pull request #10034 from frederic34/oldfiles

2018-12-14 19:25:01 +01:00

upgrade.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00