florian HENRY e2d13c0e1f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ...

dev_importproduct_measuringunit

Conflicts:
	htdocs/contact/consumption.php
	htdocs/webservices/server_productorservice.php

2019-02-13 09:23:52 +01:00

..

doctemplates

Debug website module

2018-12-17 17:29:04 +01:00

lib

Merge branch 'develop' into nospaceaftercomma

2019-01-30 18:27:35 +01:00

medias

Remove image

2019-01-31 12:48:51 +01:00

mssql

…

mysql

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

2019-02-13 09:23:52 +01: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

Merge remote-tracking branch 'upstream/develop' into psr2squizwhite

2019-02-03 22:41:57 +01:00

default.css

trim trailing

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

fileconf.php

PEAR FunctionCallSignature

2019-02-10 10:45:49 +01:00

inc.php

Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma

2019-01-27 23:23:38 +01:00

index.php

Merge branch 'develop' into nospaceaftercomma

2019-01-30 18:27:35 +01:00

install.forced.sample.php

…

phpinfo.php

PSR2.Files.EndFileNewline.TooMany

2019-01-27 14:10:35 +01:00

repair.php

Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma

2019-01-27 23:23:38 +01:00

robots.txt

…

step1.php

Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma

2019-01-27 23:23:38 +01:00

step2.php

PSR2 space after comma in function call

2019-01-27 11:55:16 +01:00

step4.php

PSR2 space after comma in function call

2019-01-27 11:55:16 +01:00

step5.php

Merge branch 'develop' into nospaceaftercomma

2019-01-30 18:27:35 +01:00

upgrade2.php

Merge branch 'develop' into nospaceaftercomma

2019-01-30 18:27:35 +01:00

upgrade.php

Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma

2019-01-27 23:23:38 +01:00