Conflicts: .travis.yml htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php htdocs/core/modules/commande/doc/pdf_proforma.modules.php htdocs/includes/adodbtime/adodb-time.inc.php htdocs/langs/en_US/accountancy.lang |
||
|---|---|---|
| .. | ||
| doc | ||
| index.html | ||
| mod_expedition_ribera.php | ||
| mod_expedition_safor.php | ||
| modules_expedition.php | ||