Laurent Destailleur 6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php

2018-12-01 19:23:06 +01:00

..

canvas

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

class

fix scrutinizer issue : The variable seems only to be defined at a later point

2018-12-01 15:45:02 +01:00

agenda.php

Fix look and feel v8

2018-11-25 11:57:19 +01:00

card.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

document.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

info.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

ldap.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

list.php

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

2018-12-01 19:23:06 +01:00

note.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

perso.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

vcard.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00