Regis Houssin 1befd9c67f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ...

develop_dict

Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql

2017-08-23 21:05:36 +02:00

..

action

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

2017-08-23 17:02:53 +02:00

admin

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

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

mailing

Fix translation done twice into field title of array

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

propal

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

2017-08-22 18:49:40 +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

…

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