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

Conflicts:
	htdocs/user/card.php

2017-08-26 22:33:56 +02:00

..

action

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

2017-08-26 22:33:56 +02:00

admin

NEW Can use translations into all substitutions (watermark, freetext...)

2017-04-17 23:54:09 +02:00

mailing

Merge emailing target selectors.

2017-08-25 21:20:27 +02:00

propal

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

2017-08-02 17:51:19 +02:00

prospect

New: getEntity function use true $shared value by default

2017-05-30 18:50:54 +02:00

address.php

Fix css and look 5.0

2017-01-22 12:13:32 +01:00

card.php

Merge pull request #7100 from tuxgasy/develop_addmoresummary_hook

2017-07-25 20:32:10 +02:00

contact.php

Fix translation done twice into field title of array

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

index.php

New: getEntity function use true $shared value by default

2017-05-30 18:50:54 +02:00

multiprix.php

Fix css and look 5.0

2017-01-22 12:13:32 +01:00

recap-client.php

[Qual] Close database handler should be after Footer

2015-12-11 14:19:38 +01:00

remise.php

Fix var not sanitized

2017-05-16 13:27:32 +02:00

remx.php

Fix var not sanitized

2017-05-16 13:27:32 +02:00