Laurent Destailleur 9a08a6bf6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ...

Conflicts:
	htdocs/categories/traduction.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contact/card.php
	htdocs/core/modules/modSociete.class.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/langs/en_US/products.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php

2019-12-23 14:13:26 +01:00

..

doctemplates

Update website temp

2019-12-02 09:19:20 +01:00

lib

Clean code

2019-10-20 15:16:40 +02:00

medias

Update images

2019-12-21 17:11:21 +01:00

mssql

…

mysql

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

2019-12-23 14:13:26 +01:00

pgsql

Move Gnu.org to https

2019-09-23 21:55:30 +02:00

sqlite3

…

.gitignore

…

check.php

Scrutinizer Auto-Fixes

2019-11-13 17:32:11 +00:00

default.css

Last recent versions of migration at top

2019-11-02 17:18:34 +01:00

fileconf.php

fix

2019-10-27 10:19:36 +01:00

inc.php

Fix warnings

2019-10-01 11:37:15 +02:00

index.php

Look and feel v11

2019-11-28 12:40:53 +01:00

install.forced.sample.php

Move Gnu.org to https

2019-09-23 21:55:30 +02:00

phpinfo.php

Move Gnu.org to https

2019-09-23 21:55:30 +02:00

repair.php

Fix repair.php removed tabs when it should not

2019-12-19 12:28:50 +01:00

robots.txt

…

step1.php

Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen

2019-10-16 20:00:01 +02:00

step2.php

Merge remote-tracking branch 'upstream/develop' into 11.0_https

2019-10-01 06:12:24 +02:00

step4.php

Move Gnu.org to https

2019-09-23 21:55:30 +02:00

step5.php

Move Gnu.org to https

2019-09-23 21:55:30 +02:00

upgrade2.php

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

2019-12-14 14:53:49 +01:00

upgrade.php

Move Gnu.org to https

2019-09-23 21:55:30 +02:00