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

Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/societe/class/societe.class.php
	htdocs/societe/list.php

2017-09-12 13:26:25 +02:00

..

canvas

Clean code

2017-09-04 13:17:18 +02:00

class

Fix var init

2017-07-13 23:52:02 +02:00

agenda.php

Fix error on contact/address not linked on thirdparty

2017-08-25 13:50:45 +02:00

card.php

Update card.php

2017-07-10 21:39:25 +02:00

document.php

Look and feel v6

2017-05-23 01:32:19 +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

Look and feel v6

2017-05-23 01:32:19 +02:00

ldap.php

Look and feel v6

2017-05-23 01:32:19 +02:00

list.php

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

2017-09-12 13:26:25 +02:00

note.php

Look and feel v6

2017-05-23 01:32:19 +02:00

perso.php

Look and feel v6

2017-05-23 01:32:19 +02:00

vcard.php

Merge remote-tracking branch 'origin/3.7' into develop

2015-08-13 04:03:23 +02:00