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

dev_importproduct_measuringunit

Conflicts:
	htdocs/margin/agentMargins.php
	htdocs/product/stock/movement_card.php
	htdocs/projet/tasks/time.php
	htdocs/resource/class/html.formresource.class.php

2019-02-13 12:52:07 +01:00

..

admin

PSR2 space after comma in function call

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

lib

PSR2 space after comma in function call

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

tabs

PSR2 space after comma in function call

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

agentMargins.php

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

2019-02-13 12:52:07 +01:00

checkMargins.php

Merge branch 'develop' into nospaceaftercomma

2019-02-03 19:27:16 +01:00

customerMargins.php

GenericFunctionsFunctionCallArgumentSpacing

2019-02-09 12:00:49 +01:00

index.php

PSR2.Files.EndFileNewline.TooMany

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

productMargins.php

PSR2 space after comma in function call

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