florian HENRY 137f1c4e4f Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/resource/class/dolresource.class.php		2016-08-18 08:49:54 +02:00
..
class
add.php
card.php
contact.php
document.php
element_resource.php
index.html
list.php
note.php