dolibarr/htdocs/projet/tasks
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
..
stats PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
comment.php PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
contact.php PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
document.php PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
list.php Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
note.php PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
task.php PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
time.php Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2019-02-13 12:52:07 +01:00