Laurent Destailleur 0a7ce338f9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ...

Conflicts:
	htdocs/core/class/commondocgenerator.class.php

2018-08-28 02:23:34 +02:00

..

doctemplates

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

2018-08-16 14:47:56 +02:00

lib

…

medias

Complete the demo profile

2018-01-19 12:39:47 +01:00

mssql

…

mysql

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-08-28 02:23:34 +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

Bad picto

2018-06-05 09:02:50 +02:00

default.css

…

fileconf.php

Upgrade octicons

2018-04-15 11:27:39 +02:00

inc.php

Fix bad constructor

2018-06-30 01:59:54 +02:00

index.php

…

install.forced.sample.php

…

phpinfo.php

…

repair.php

FIX add html comment

2018-07-20 18:45:52 +02:00

robots.txt

…

step1.php

Fix trim config values

2018-07-04 11:16:45 +02:00

step2.php

Upgrade octicons

2018-04-15 11:27:39 +02:00

step4.php

Upgrade octicons

2018-04-15 11:27:39 +02:00

step5.php

Fix step5 upgrade process

2018-04-13 17:05:35 +02:00

upgrade2.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-07-27 12:54:45 +02:00

upgrade.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-07-16 15:44:44 +02:00