Laurent Destailleur 1d04ce2185 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/functions.lib.php		2018-10-09 17:07:32 +02:00
..
action	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-09 17:07:32 +02:00
admin	standardize	2018-07-29 13:40:35 +02:00
mailing	Standardize code	2018-09-23 16:09:25 +02:00
propal	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2018-10-09 14:54:18 +02:00
prospect	standardize	2018-07-29 17:17:29 +02:00
address.php	loadlangs	2018-05-26 20:32:23 +02:00
card.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-20 23:43:34 +02:00
contact.php	standardize	2018-07-29 17:17:29 +02:00
index.php	standardize	2018-07-29 17:17:29 +02:00
multiprix.php	Merge pull request #9440 from frederic34/patch-5	2018-09-12 18:24:02 +02:00
recap-client.php	standardize	2018-07-29 17:17:29 +02:00
remise.php	standardize	2018-07-29 17:17:29 +02:00
remx.php	standardize	2018-07-29 17:17:29 +02:00