Laurent Destailleur 42fda54edf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/compta/bank/card.php
	htdocs/fichinter/list.php
	htdocs/product/stock/replenish.php

2019-04-02 19:41:58 +02:00

..

admin

replace html by html5 in margin and modulebuilder

2019-03-03 09:08:29 +01:00

lib

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

2019-04-02 19:41:58 +02:00

tabs

replace html by html5 in margin and modulebuilder

2019-03-03 09:08:29 +01:00

agentMargins.php

Merge pull request #10736 from OPEN-DSI/fix-margin-agents3

2019-03-07 20:45:40 +01:00

checkMargins.php

Merge pull request #10736 from OPEN-DSI/fix-margin-agents3

2019-03-07 20:45:40 +01:00

customerMargins.php

Merge pull request #10736 from OPEN-DSI/fix-margin-agents3

2019-03-07 20:45:40 +01:00

index.php

PSR2.Files.EndFileNewline.TooMany

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

productMargins.php

Merge pull request #10736 from OPEN-DSI/fix-margin-agents3

2019-03-07 20:45:40 +01:00