forked from Wavyzz/dolibarr
Conflicts: htdocs/comm/propal/document.php htdocs/core/class/fileupload.class.php htdocs/projet/fiche.php Change-Id: Ib36cd4d6ad5eb1e9ad2a188ef276f37c098cfef4
Conflicts: htdocs/comm/propal/document.php htdocs/core/class/fileupload.class.php htdocs/projet/fiche.php Change-Id: Ib36cd4d6ad5eb1e9ad2a188ef276f37c098cfef4