Laurent Destailleur 68f6ebd0ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/class/commande.class.php htdocs/core/lib/security.lib.php htdocs/modulebuilder/template/myobject_card.php		2018-10-30 14:47:39 +01:00
..
class
agenda.php
card.php
contact.php
document.php
element_resource.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-30 14:47:39 +01:00
index.html
list.php
note.php