Laurent Destailleur 4b9f54e571 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/install/mysql/data/llx_accounting.sql htdocs/install/mysql/migration/5.0.0-6.0.0.sql htdocs/install/mysql/tables/llx_holiday_config.sql		2017-09-01 17:34:57 +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	NEW Include a color syntaxed HTML editor for emailing edition.	2017-09-01 13:09:13 +02:00
propal	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-01 17:34:57 +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