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

Conflicts:
	htdocs/adherents/type.php
	htdocs/contrat/services.php
	htdocs/contrat/tpl/linkedobjectblock.tpl.php
	htdocs/install/upgrade2.php

2018-02-14 22:08:18 +01:00

..

doctemplates

Complete templates

2017-11-16 12:09:17 +01:00

lib

…

medias

Complete the demo profile

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

mssql

…

mysql

Fix accounting module with multicompany

2018-02-06 01:00:35 +01:00

pgsql

new :new column into extrafeild table to get update create information

2017-07-25 11:57:36 +02:00

sqlite3

…

.gitignore

…

check.php

Fix install log disappeared

2018-02-14 14:50:22 +01:00

default.css

Look and feel v6

2017-05-26 00:02:41 +02:00

fileconf.php

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

2017-06-25 02:31:38 +02:00

inc.php

Fix log of install disappear.

2018-01-19 11:43:55 +01:00

index.php

…

install.forced.sample.php

…

phpinfo.php

…

repair.php

Fix help

2018-02-14 14:57:53 +01:00

robots.txt

…

step1.php

Fix info of collation is wrong on log

2018-01-19 12:10:03 +01:00

step2.php

Fix loading data after first install

2017-12-11 14:56:12 +01:00

step4.php

Remove warning

2017-10-26 18:40:12 +02:00

step5.php

Fix install log disappeared

2018-02-14 14:50:22 +01:00

upgrade2.php

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

2018-02-14 22:08:18 +01:00

upgrade.php

Fix migration for files from modules

2018-01-24 20:00:27 +01:00