dolibarr/htdocs/projet
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
..
activity Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
admin Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
ajax Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
class Merge pull request #10487 from frederic34/psr2squizwhite 2019-02-08 09:30:25 +01:00
stats PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
tasks Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2019-02-13 12:52:07 +01:00
card.php Merge pull request #10487 from frederic34/psr2squizwhite 2019-02-08 09:30:25 +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
element.php Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
ganttchart.inc.php Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
ganttview.php PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
graph_opportunities.inc.php PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
index.php PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
info.php PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
jsgantt_language.js.php Clean defined constant at begin of pages 2018-04-21 12:00:55 +02: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
tasks.php Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00