Laurent Destailleur ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php

2018-09-04 21:35:43 +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 '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-09-04 21:35:43 +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

minor html and css corrections (as shown by browser validation and phpstorm inspections)

2018-07-07 23:50:41 +02:00

default.css

trim trailing

2018-07-26 18:05:20 +02:00

fileconf.php

Update fileconf.php

2018-08-29 21:46:39 +02:00

inc.php

Main url auto-filled field was hardcoded as http: easy to overlook this when running installer via https.

2018-08-18 23:45:20 +02: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 develop

2018-07-24 19:37:04 +02:00

robots.txt

…

step1.php

minor html and css corrections (as shown by browser validation and phpstorm inspections)

2018-07-07 23:50:41 +02:00

step2.php

minor html and css corrections (as shown by browser validation and phpstorm inspections)

2018-07-07 23:50:41 +02:00

step4.php

minor html and css corrections (as shown by browser validation and phpstorm inspections)

2018-07-07 23:50:41 +02:00

step5.php

minor html and css corrections (as shown by browser validation and phpstorm inspections)

2018-07-07 23:50:41 +02:00

upgrade2.php

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

2018-08-08 17:44:22 +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