Laurent Destailleur e4645cf2c5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/blockedlog/class/blockedlog.class.php
	htdocs/contrat/card.php
	htdocs/societe/card.php

2017-10-27 02:12:35 +02:00

..

admin

Look and feel v6

2017-05-29 15:34:00 +02:00

lib

Clean dead code

2017-05-17 14:52:27 +02:00

tabs

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

2017-10-27 02:12:35 +02:00

agentMargins.php

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

checkMargins.php

USe second parameter in GETPOST

2017-09-15 10:52:53 +02:00

customerMargins.php

FIX #7312

2017-09-02 01:28:19 +02:00

index.php

Merge remote-tracking branch 'origin/3.5' into 3.6

2015-01-18 15:21:38 +01:00

productMargins.php

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00