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

Conflicts:
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/filefunc.inc.php

2017-08-17 22:21:30 +02:00

..

tpl

Replace usage of $bc[$var] with class="oddeven"

2017-04-14 11:22:48 +02:00

card.php

Merge remote-tracking branch 'origin/5.0' into 6.0

2017-08-17 22:03:26 +02:00

contact.php

Maxi miscellaneous debug

2017-05-05 12:33:49 +02:00

document.php

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

2017-05-10 00:48:27 +02:00

impayees.php

Fix translation done twice into field title of array

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

index.html

…

info.php

Maxi miscellaneous debug

2017-05-05 12:33:49 +02:00

list.php

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

2017-08-02 17:56:09 +02:00

note.php

Maxi miscellaneous debug

2017-05-05 12:33:49 +02:00

paiement.php

Fix translation done twice into field title of array

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

rapport.php

Fix GETPOST of lang_id

2017-06-27 17:27:01 +02:00