Conflicts: dev/dolibarr_changes.txt htdocs/compta/facture/card.php htdocs/compta/facture/list.php htdocs/main.inc.php |
||
|---|---|---|
| .. | ||
| blockUI.js | ||
| dst.js | ||
| editinplace.js | ||
| index.html | ||
| lib_foot.js.php | ||
| lib_head.js.php | ||
| lib_notification.js.php | ||
| lib_photosresize.js | ||
| lib_rare.js | ||
| listview.js | ||
| timepicker.js.php | ||
| timesheet.js | ||