Laurent Destailleur 55d3e72463 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/contact/class/contact.class.php htdocs/societe/card.php		2018-03-12 19:02:30 +01:00
..
canvas	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-21 14:35:33 +01:00
class	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-03-12 19:02:30 +01:00
agenda.php	Standardize code for events	2017-10-04 12:58:13 +02:00
card.php	Fix: wrong image path with multicompany sharing	2018-01-10 12:52:30 +01:00
document.php	Merge pull request #8047 from hregis/develop_multicompany	2018-01-11 01:07:17 +01:00
index.html
info.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +02:00
ldap.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +02:00
list.php	correct merge	2017-12-29 20:41:39 +01:00
note.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +02:00
perso.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +02:00
vcard.php